diff options
| author | Mark Felder <feld@feld.me> | 2024-01-21 03:58:53 +0000 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2024-01-21 03:58:53 +0000 |
| commit | 06813d4a0eb710fa5ac78333af15ce912a0c3d84 (patch) | |
| tree | 0dd2ed69c0704f695c3da43d0768e9a01f4953df /ci | |
| parent | 68f421c203b8b5b178abf0f6dd0e10ee09063d5a (diff) | |
Reorganize ci scripts
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/Dockerfile | 8 | ||||
| -rwxr-xr-x | ci/elixir-1.15/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/Dockerfile b/ci/elixir-1.15/Dockerfile new file mode 100644 index 000000000..a2b566873 --- /dev/null +++ b/ci/elixir-1.15/Dockerfile @@ -0,0 +1,8 @@ +FROM elixir:1.12.3 + +# 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/build_and_push.sh b/ci/elixir-1.15/build_and_push.sh new file mode 100755 index 000000000..fd7ffe2de --- /dev/null +++ b/ci/elixir-1.15/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.15 --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 |