diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2024-07-28 13:41:58 +0200 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-07-28 13:41:58 +0200 |
| commit | ad8c26f6c285412be041b7dcaeefa8741d3a6e57 (patch) | |
| tree | 041e9af5f9b64215f12d195d6c98b548b0c1b622 /ci | |
| parent | 7620b520c13a1c204810cf0cfe6a7b70b9a1c59d (diff) | |
| parent | 6876761837bad399758cd6a93be5bf5cc8a81cef (diff) | |
| download | pleroma-ad8c26f6c285412be041b7dcaeefa8741d3a6e57.tar.gz pleroma-ad8c26f6c285412be041b7dcaeefa8741d3a6e57.zip | |
Merge remote-tracking branch 'origin/develop' into post-languages
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/elixir-1.13.4-otp-25/Dockerfile (renamed from ci/elixir-1.15-otp25/Dockerfile) | 2 | ||||
| -rwxr-xr-x | ci/elixir-1.13.4-otp-25/build_and_push.sh | 1 | ||||
| -rwxr-xr-x | ci/elixir-1.15-otp25/build_and_push.sh | 1 | ||||
| -rw-r--r-- | ci/elixir-1.15.8-otp-26/Dockerfile | 8 | ||||
| -rwxr-xr-x | ci/elixir-1.15.8-otp-26/build_and_push.sh | 1 | ||||
| -rw-r--r-- | ci/elixir-1.16.3-otp-26/Dockerfile | 8 | ||||
| -rwxr-xr-x | ci/elixir-1.16.3-otp-26/build_and_push.sh | 1 | ||||
| -rw-r--r-- | ci/elixir-1.17.1-otp-26/Dockerfile | 8 | ||||
| -rwxr-xr-x | ci/elixir-1.17.1-otp-26/build_and_push.sh | 1 |
9 files changed, 29 insertions, 2 deletions
diff --git a/ci/elixir-1.15-otp25/Dockerfile b/ci/elixir-1.13.4-otp-25/Dockerfile index 3335c6e36..25a1639e8 100644 --- a/ci/elixir-1.15-otp25/Dockerfile +++ b/ci/elixir-1.13.4-otp-25/Dockerfile @@ -1,4 +1,4 @@ -FROM elixir:1.15.7-otp-25 +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.4-otp-25/build_and_push.sh b/ci/elixir-1.13.4-otp-25/build_and_push.sh new file mode 100755 index 000000000..b8ca1d24d --- /dev/null +++ b/ci/elixir-1.13.4-otp-25/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.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 06fe74f34..000000000 --- a/ci/elixir-1.15-otp25/build_and_push.sh +++ /dev/null @@ -1 +0,0 @@ -docker buildx build --platform linux/amd64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15-otp25 --push . diff --git a/ci/elixir-1.15.8-otp-26/Dockerfile b/ci/elixir-1.15.8-otp-26/Dockerfile new file mode 100644 index 000000000..7142ace04 --- /dev/null +++ b/ci/elixir-1.15.8-otp-26/Dockerfile @@ -0,0 +1,8 @@ +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 +RUN apt-get update &&\ + apt-get install -y libmagic-dev cmake libimage-exiftool-perl ffmpeg &&\ + mix local.hex --force &&\ + mix local.rebar --force 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 . diff --git a/ci/elixir-1.16.3-otp-26/Dockerfile b/ci/elixir-1.16.3-otp-26/Dockerfile new file mode 100644 index 000000000..dce5ac636 --- /dev/null +++ b/ci/elixir-1.16.3-otp-26/Dockerfile @@ -0,0 +1,8 @@ +FROM elixir:1.16.3-otp-26 + +# Single RUN statement, otherwise intermediate images are created +# https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run +RUN apt-get update &&\ + apt-get install -y libmagic-dev cmake libimage-exiftool-perl ffmpeg &&\ + mix local.hex --force &&\ + mix local.rebar --force diff --git a/ci/elixir-1.16.3-otp-26/build_and_push.sh b/ci/elixir-1.16.3-otp-26/build_and_push.sh new file mode 100755 index 000000000..b93376c79 --- /dev/null +++ b/ci/elixir-1.16.3-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.16.3-otp-26 --push . diff --git a/ci/elixir-1.17.1-otp-26/Dockerfile b/ci/elixir-1.17.1-otp-26/Dockerfile new file mode 100644 index 000000000..c1ee2fb30 --- /dev/null +++ b/ci/elixir-1.17.1-otp-26/Dockerfile @@ -0,0 +1,8 @@ +FROM elixir:1.17.1-otp-26 + +# Single RUN statement, otherwise intermediate images are created +# https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run +RUN apt-get update &&\ + apt-get install -y libmagic-dev cmake libimage-exiftool-perl ffmpeg &&\ + mix local.hex --force &&\ + mix local.rebar --force diff --git a/ci/elixir-1.17.1-otp-26/build_and_push.sh b/ci/elixir-1.17.1-otp-26/build_and_push.sh new file mode 100755 index 000000000..2fbeaed6a --- /dev/null +++ b/ci/elixir-1.17.1-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.17.1-otp-26 --push . |