diff options
| author | Mark Felder <feld@feld.me> | 2024-06-09 08:37:24 -0400 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2024-06-09 08:37:24 -0400 |
| commit | 51eeb8082257c152f26a3abed68c009fd3d1e262 (patch) | |
| tree | 5b50750df36fb701305b6e33e82d954092694165 /ci | |
| parent | f000dab372993e1cbd494535b82c248d44595ab5 (diff) | |
| parent | de80a7e8906cb54b436a2f6a754b05c4eae13d79 (diff) | |
| download | pleroma-51eeb8082257c152f26a3abed68c009fd3d1e262.tar.gz pleroma-51eeb8082257c152f26a3abed68c009fd3d1e262.zip | |
Merge remote-tracking branch 'origin/develop' into webpush-polls
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/elixir-1.13.4-otp-25/Dockerfile (renamed from ci/elixir-1.13/Dockerfile) | 2 | ||||
| -rwxr-xr-x | ci/elixir-1.13.4-otp-25/build_and_push.sh (renamed from ci/elixir-1.13/build_and_push.sh) | 2 | ||||
| -rwxr-xr-x | ci/elixir-1.15-otp25/build_and_push.sh | 1 | ||||
| -rw-r--r-- | ci/elixir-1.15.8-otp-26/Dockerfile (renamed from ci/elixir-1.15-otp25/Dockerfile) | 2 | ||||
| -rwxr-xr-x | ci/elixir-1.15.8-otp-26/build_and_push.sh | 1 |
5 files changed, 4 insertions, 4 deletions
diff --git a/ci/elixir-1.13/Dockerfile b/ci/elixir-1.13.4-otp-25/Dockerfile index b8bceb3d9..25a1639e8 100644 --- a/ci/elixir-1.13/Dockerfile +++ b/ci/elixir-1.13.4-otp-25/Dockerfile @@ -1,4 +1,4 @@ -FROM elixir:1.13.4-otp-24 +FROM elixir:1.13.4-otp-25 # Single RUN statement, otherwise intermediate images are created # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run diff --git a/ci/elixir-1.13/build_and_push.sh b/ci/elixir-1.13.4-otp-25/build_and_push.sh index 64e1856db..b8ca1d24d 100755 --- a/ci/elixir-1.13/build_and_push.sh +++ b/ci/elixir-1.13.4-otp-25/build_and_push.sh @@ -1 +1 @@ -docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.13.4-otp-24 --push . +docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.13.4-otp-25 --push . diff --git a/ci/elixir-1.15-otp25/build_and_push.sh b/ci/elixir-1.15-otp25/build_and_push.sh deleted file mode 100755 index a28e0d33c..000000000 --- a/ci/elixir-1.15-otp25/build_and_push.sh +++ /dev/null @@ -1 +0,0 @@ -docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15-otp25 --push . diff --git a/ci/elixir-1.15-otp25/Dockerfile b/ci/elixir-1.15.8-otp-26/Dockerfile index 3335c6e36..7142ace04 100644 --- a/ci/elixir-1.15-otp25/Dockerfile +++ b/ci/elixir-1.15.8-otp-26/Dockerfile @@ -1,4 +1,4 @@ -FROM elixir:1.15.7-otp-25 +FROM elixir:1.15.8-otp-26 # Single RUN statement, otherwise intermediate images are created # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run diff --git a/ci/elixir-1.15.8-otp-26/build_and_push.sh b/ci/elixir-1.15.8-otp-26/build_and_push.sh new file mode 100755 index 000000000..59bc63454 --- /dev/null +++ b/ci/elixir-1.15.8-otp-26/build_and_push.sh @@ -0,0 +1 @@ +docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15.8-otp-26 --push . |