diff options
| author | Lain Soykaf <lain@lain.com> | 2024-05-20 12:30:15 +0400 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2024-05-20 12:30:15 +0400 |
| commit | ad26b6d593d83ddb539a5c61ee9f639f7b40531e (patch) | |
| tree | 7df211d68414fea73074731b31be9f700cff8883 /ci | |
| parent | ddb9e90c405369496fdf9e6dfed593eff8d5dc5c (diff) | |
| parent | e8cd6662eb2a534e3be16b522bf81b25b194edab (diff) | |
| download | pleroma-ad26b6d593d83ddb539a5c61ee9f639f7b40531e.tar.gz pleroma-ad26b6d593d83ddb539a5c61ee9f639f7b40531e.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bump-elixir
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 |