From 06813d4a0eb710fa5ac78333af15ce912a0c3d84 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Sun, 21 Jan 2024 03:58:53 +0000 Subject: [PATCH] Reorganize ci scripts --- ci/build_and_push.sh | 1 - ci/{ => elixir-1.12}/Dockerfile | 0 ci/elixir-1.12/build_and_push.sh | 1 + ci/elixir-1.15/Dockerfile | 8 ++++++++ ci/elixir-1.15/build_and_push.sh | 1 + ci/{postgres_rum => postgres-with-rum-13}/Dockerfile | 0 .../build_and_push.sh | 0 7 files changed, 10 insertions(+), 1 deletion(-) delete mode 100755 ci/build_and_push.sh rename ci/{ => elixir-1.12}/Dockerfile (100%) create mode 100755 ci/elixir-1.12/build_and_push.sh create mode 100644 ci/elixir-1.15/Dockerfile create mode 100755 ci/elixir-1.15/build_and_push.sh rename ci/{postgres_rum => postgres-with-rum-13}/Dockerfile (100%) rename ci/{postgres_rum => postgres-with-rum-13}/build_and_push.sh (100%) 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 similarity index 100% rename from ci/Dockerfile rename to 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 similarity index 100% rename from ci/postgres_rum/Dockerfile rename to 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 similarity index 100% rename from ci/postgres_rum/build_and_push.sh rename to ci/postgres-with-rum-13/build_and_push.sh