diff options
| author | marcin mikołajczak <me@mkljczk.pl> | 2024-02-02 17:13:15 +0000 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-02-02 18:55:37 +0100 |
| commit | e798be90accbc93e9c7102a51ffd2575c9e617ec (patch) | |
| tree | a8457757821ed028bd0517e7ace16e8c8ede9f4f /ci | |
| parent | 250a4873a6f50f71cb5c387de46d711dc1bd1a39 (diff) | |
| parent | 3b9d991514e53ad8f442ffc674dd9b1422fdc415 (diff) | |
| download | pleroma-e798be90accbc93e9c7102a51ffd2575c9e617ec.tar.gz pleroma-e798be90accbc93e9c7102a51ffd2575c9e617ec.zip | |
Merge branch 'develop' into 'post-languages'
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build_and_push.sh | 1 | ||||
| -rw-r--r-- | ci/elixir-1.12/Dockerfile (renamed from ci/Dockerfile) | 0 | ||||
| -rwxr-xr-x | ci/elixir-1.12/build_and_push.sh | 1 | ||||
| -rw-r--r-- | ci/elixir-1.15-otp25/Dockerfile | 8 | ||||
| -rwxr-xr-x | ci/elixir-1.15-otp25/build_and_push.sh | 1 | ||||
| -rw-r--r-- | ci/postgres-with-rum-13/Dockerfile (renamed from ci/postgres_rum/Dockerfile) | 0 | ||||
| -rwxr-xr-x | ci/postgres-with-rum-13/build_and_push.sh (renamed from ci/postgres_rum/build_and_push.sh) | 0 |
7 files changed, 10 insertions, 1 deletions
diff --git a/ci/build_and_push.sh b/ci/build_and_push.sh deleted file mode 100755 index 484cc2643..000000000 --- a/ci/build_and_push.sh +++ /dev/null @@ -1 +0,0 @@ -docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:latest --push . diff --git a/ci/Dockerfile b/ci/elixir-1.12/Dockerfile index a2b566873..a2b566873 100644 --- a/ci/Dockerfile +++ b/ci/elixir-1.12/Dockerfile diff --git a/ci/elixir-1.12/build_and_push.sh b/ci/elixir-1.12/build_and_push.sh new file mode 100755 index 000000000..508262ed8 --- /dev/null +++ b/ci/elixir-1.12/build_and_push.sh @@ -0,0 +1 @@ +docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.12 --push . diff --git a/ci/elixir-1.15-otp25/Dockerfile b/ci/elixir-1.15-otp25/Dockerfile new file mode 100644 index 000000000..3335c6e36 --- /dev/null +++ b/ci/elixir-1.15-otp25/Dockerfile @@ -0,0 +1,8 @@ +FROM elixir:1.15.7-otp-25 + +# 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-otp25/build_and_push.sh b/ci/elixir-1.15-otp25/build_and_push.sh new file mode 100755 index 000000000..06fe74f34 --- /dev/null +++ b/ci/elixir-1.15-otp25/build_and_push.sh @@ -0,0 +1 @@ +docker buildx build --platform linux/amd64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15-otp25 --push . diff --git a/ci/postgres_rum/Dockerfile b/ci/postgres-with-rum-13/Dockerfile index dc727df1d..dc727df1d 100644 --- a/ci/postgres_rum/Dockerfile +++ b/ci/postgres-with-rum-13/Dockerfile diff --git a/ci/postgres_rum/build_and_push.sh b/ci/postgres-with-rum-13/build_and_push.sh index c437b64a7..c437b64a7 100755 --- a/ci/postgres_rum/build_and_push.sh +++ b/ci/postgres-with-rum-13/build_and_push.sh |