Skip to content

Commit

Permalink
backports sync
Browse files Browse the repository at this point in the history
  • Loading branch information
@stamepicmorg
stamepicmorg committed Aug 10, 2024
2 parents 4f22662 + 202e768 commit 0057c1b
Show file tree
Hide file tree
Showing 4,757 changed files with 8,914 additions and 332,266 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,9 @@ ecosystem-debian-bookworm-images:
cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/slim && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/main && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/develop && pwd && make build && make deploy
make ecosystem-debian-bookworm-jdk-images

ecosystem-debian-bookworm-jdk-images:
cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8 && pwd && make build && make deploy
Expand Down
6 changes: 3 additions & 3 deletions bin/ansible/roles/atlassian.bitbucket/files/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ app:

build:
make pip
python3 kaniko-build.py --version
kaniko-wrapper --version

dry:
make dry-run
Expand All @@ -18,7 +18,7 @@ test:
make dry-run

dry-run:
python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run

pip:
rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
Expand All @@ -37,7 +37,7 @@ build-compose:

deploy:
make pip
python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug

deploy-compose:
docker-compose push
Expand Down
194 changes: 0 additions & 194 deletions bin/ansible/roles/atlassian.bitbucket/files/kaniko-build.py
View file

This file was deleted.

6 changes: 3 additions & 3 deletions bin/ansible/roles/atlassian.jira/files/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ app:

build:
make pip
python3 kaniko-build.py --version
kaniko-wrapper --version

dry:
make dry-run
Expand All @@ -18,7 +18,7 @@ test:
make dry-run

dry-run:
python3 kaniko-build.py --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run

pip:
rm -rf /usr/lib/python3.6/EXTERNALLY-MANAGED
Expand All @@ -37,7 +37,7 @@ build-compose:

deploy:
make pip
python3 kaniko-build.py --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug

deploy-compose:
docker-compose push
Expand Down
Loading

0 comments on commit 0057c1b

Please sign in to comment.