From d9f031c9da42a1bde12a37bf26298c3a3c731121 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Wed, 31 May 2023 21:11:13 +0000 Subject: Bump minimum Elixir to 1.12 --- ci/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/Dockerfile b/ci/Dockerfile index ca28b7029..a2b566873 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -1,4 +1,4 @@ -FROM elixir:1.11.4 +FROM elixir:1.12.3 # Single RUN statement, otherwise intermediate images are created # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run -- cgit v1.2.3 From 935dce9a0b9ae4ff2d44033ec372f64b7fb6b5ce Mon Sep 17 00:00:00 2001 From: Lain Soykaf Date: Wed, 13 Dec 2023 12:45:52 +0400 Subject: Gitlab CI: Update postgres for rum tests. --- ci/postgres_rum/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 ci/postgres_rum/Dockerfile (limited to 'ci') diff --git a/ci/postgres_rum/Dockerfile b/ci/postgres_rum/Dockerfile new file mode 100644 index 000000000..dc727df1d --- /dev/null +++ b/ci/postgres_rum/Dockerfile @@ -0,0 +1,3 @@ +FROM postgres:13-bullseye + +RUN apt-get update && apt-get install -y postgresql-13-rum/bullseye-pgdg -- cgit v1.2.3 From 1458de92f0eb2e743c359a86a27db83b117595e9 Mon Sep 17 00:00:00 2001 From: Lain Soykaf Date: Wed, 13 Dec 2023 13:08:00 +0400 Subject: Gitlab CI: Switch to our own docker hub --- ci/postgres_rum/build_and_push.sh | 1 + 1 file changed, 1 insertion(+) create mode 100755 ci/postgres_rum/build_and_push.sh (limited to 'ci') diff --git a/ci/postgres_rum/build_and_push.sh b/ci/postgres_rum/build_and_push.sh new file mode 100755 index 000000000..c437b64a7 --- /dev/null +++ b/ci/postgres_rum/build_and_push.sh @@ -0,0 +1 @@ +docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/postgres-with-rum-13:latest --push . -- cgit v1.2.3 From 06813d4a0eb710fa5ac78333af15ce912a0c3d84 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Sun, 21 Jan 2024 03:58:53 +0000 Subject: Reorganize ci scripts --- ci/Dockerfile | 8 -------- ci/build_and_push.sh | 1 - ci/elixir-1.12/Dockerfile | 8 ++++++++ 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-with-rum-13/Dockerfile | 3 +++ ci/postgres-with-rum-13/build_and_push.sh | 1 + ci/postgres_rum/Dockerfile | 3 --- ci/postgres_rum/build_and_push.sh | 1 - 10 files changed, 22 insertions(+), 13 deletions(-) delete mode 100644 ci/Dockerfile delete mode 100755 ci/build_and_push.sh create mode 100644 ci/elixir-1.12/Dockerfile 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 create mode 100644 ci/postgres-with-rum-13/Dockerfile create mode 100755 ci/postgres-with-rum-13/build_and_push.sh delete mode 100644 ci/postgres_rum/Dockerfile delete mode 100755 ci/postgres_rum/build_and_push.sh (limited to 'ci') diff --git a/ci/Dockerfile b/ci/Dockerfile deleted file mode 100644 index a2b566873..000000000 --- a/ci/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -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/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/elixir-1.12/Dockerfile b/ci/elixir-1.12/Dockerfile new file mode 100644 index 000000000..a2b566873 --- /dev/null +++ b/ci/elixir-1.12/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.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-with-rum-13/Dockerfile b/ci/postgres-with-rum-13/Dockerfile new file mode 100644 index 000000000..dc727df1d --- /dev/null +++ b/ci/postgres-with-rum-13/Dockerfile @@ -0,0 +1,3 @@ +FROM postgres:13-bullseye + +RUN apt-get update && apt-get install -y postgresql-13-rum/bullseye-pgdg diff --git a/ci/postgres-with-rum-13/build_and_push.sh b/ci/postgres-with-rum-13/build_and_push.sh new file mode 100755 index 000000000..c437b64a7 --- /dev/null +++ b/ci/postgres-with-rum-13/build_and_push.sh @@ -0,0 +1 @@ +docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/postgres-with-rum-13:latest --push . diff --git a/ci/postgres_rum/Dockerfile b/ci/postgres_rum/Dockerfile deleted file mode 100644 index dc727df1d..000000000 --- a/ci/postgres_rum/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM postgres:13-bullseye - -RUN apt-get update && apt-get install -y postgresql-13-rum/bullseye-pgdg diff --git a/ci/postgres_rum/build_and_push.sh b/ci/postgres_rum/build_and_push.sh deleted file mode 100755 index c437b64a7..000000000 --- a/ci/postgres_rum/build_and_push.sh +++ /dev/null @@ -1 +0,0 @@ -docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/postgres-with-rum-13:latest --push . -- cgit v1.2.3 From aee971bd2654f61729abc34be0401862f1308e88 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Sun, 21 Jan 2024 03:59:26 +0000 Subject: Only need amd64 for now --- ci/elixir-1.15/build_and_push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/elixir-1.15/build_and_push.sh b/ci/elixir-1.15/build_and_push.sh index fd7ffe2de..79cf89344 100755 --- a/ci/elixir-1.15/build_and_push.sh +++ b/ci/elixir-1.15/build_and_push.sh @@ -1 +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 . +docker buildx build --platform linux/amd64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15 --push . -- cgit v1.2.3 From 8f0051d73929ad515cc1582f727d21e49af40d6a Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Sun, 21 Jan 2024 04:10:20 +0000 Subject: Rename 1.15 image to include otp25, clarify test names --- ci/elixir-1.15-otp25/Dockerfile | 8 ++++++++ ci/elixir-1.15-otp25/build_and_push.sh | 1 + ci/elixir-1.15/Dockerfile | 8 -------- ci/elixir-1.15/build_and_push.sh | 1 - 4 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 ci/elixir-1.15-otp25/Dockerfile create mode 100755 ci/elixir-1.15-otp25/build_and_push.sh delete mode 100644 ci/elixir-1.15/Dockerfile delete mode 100755 ci/elixir-1.15/build_and_push.sh (limited to 'ci') diff --git a/ci/elixir-1.15-otp25/Dockerfile b/ci/elixir-1.15-otp25/Dockerfile new file mode 100644 index 000000000..a2b566873 --- /dev/null +++ b/ci/elixir-1.15-otp25/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-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/elixir-1.15/Dockerfile b/ci/elixir-1.15/Dockerfile deleted file mode 100644 index a2b566873..000000000 --- a/ci/elixir-1.15/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100755 index 79cf89344..000000000 --- a/ci/elixir-1.15/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 --push . -- cgit v1.2.3 From f23c07f43aa0c2dffbf164711e56b3c694f3d10a Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Fri, 26 Jan 2024 12:35:18 -0500 Subject: Set correct image version --- ci/elixir-1.15-otp25/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/elixir-1.15-otp25/Dockerfile b/ci/elixir-1.15-otp25/Dockerfile index a2b566873..ff3a54fc5 100644 --- a/ci/elixir-1.15-otp25/Dockerfile +++ b/ci/elixir-1.15-otp25/Dockerfile @@ -1,4 +1,4 @@ -FROM elixir:1.12.3 +FROM elixir:1.15.7 # Single RUN statement, otherwise intermediate images are created # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#run -- cgit v1.2.3 From a658cf70b921fb97bb061d444df4436c389453f3 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Fri, 26 Jan 2024 17:38:40 +0000 Subject: Pin to otp25 The 1.15.7 image by default uses OTP26 now, but we really want otp25 --- ci/elixir-1.15-otp25/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/elixir-1.15-otp25/Dockerfile b/ci/elixir-1.15-otp25/Dockerfile index ff3a54fc5..3335c6e36 100644 --- a/ci/elixir-1.15-otp25/Dockerfile +++ b/ci/elixir-1.15-otp25/Dockerfile @@ -1,4 +1,4 @@ -FROM elixir:1.15.7 +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 -- cgit v1.2.3 From 226874c9d603be72699d5aa5434616efffe3f239 Mon Sep 17 00:00:00 2001 From: Lain Soykaf Date: Mon, 20 May 2024 13:12:12 +0400 Subject: CI: Add new builders for base images --- ci/elixir-1.13/Dockerfile | 8 ++++++++ ci/elixir-1.13/build_and_push.sh | 1 + ci/elixir-1.15-otp25/build_and_push.sh | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 ci/elixir-1.13/Dockerfile create mode 100755 ci/elixir-1.13/build_and_push.sh (limited to 'ci') diff --git a/ci/elixir-1.13/Dockerfile b/ci/elixir-1.13/Dockerfile new file mode 100644 index 000000000..b8bceb3d9 --- /dev/null +++ b/ci/elixir-1.13/Dockerfile @@ -0,0 +1,8 @@ +FROM elixir:1.13.4-otp-24 + +# 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.13/build_and_push.sh b/ci/elixir-1.13/build_and_push.sh new file mode 100755 index 000000000..53af4245f --- /dev/null +++ b/ci/elixir-1.13/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-otp24 --push . diff --git a/ci/elixir-1.15-otp25/build_and_push.sh b/ci/elixir-1.15-otp25/build_and_push.sh index 06fe74f34..a28e0d33c 100755 --- a/ci/elixir-1.15-otp25/build_and_push.sh +++ b/ci/elixir-1.15-otp25/build_and_push.sh @@ -1 +1 @@ -docker buildx build --platform linux/amd64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15-otp25 --push . +docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15-otp25 --push . -- cgit v1.2.3 From f8411a351de07f14fdc9c9eca30109feaadf6f93 Mon Sep 17 00:00:00 2001 From: Lain Soykaf Date: Mon, 20 May 2024 13:30:31 +0400 Subject: CI: Specify version fully in base image tag --- ci/elixir-1.13/build_and_push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/elixir-1.13/build_and_push.sh b/ci/elixir-1.13/build_and_push.sh index 53af4245f..d848344a3 100755 --- a/ci/elixir-1.13/build_and_push.sh +++ b/ci/elixir-1.13/build_and_push.sh @@ -1 +1 @@ -docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.13-otp24 --push . +docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.13.4-otp24 --push . -- cgit v1.2.3 From f5c029524752e1820ea29f6557647823ae89ecf1 Mon Sep 17 00:00:00 2001 From: Lain Soykaf Date: Mon, 20 May 2024 13:32:25 +0400 Subject: CI: Specify correct image name. --- ci/elixir-1.13/build_and_push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/elixir-1.13/build_and_push.sh b/ci/elixir-1.13/build_and_push.sh index d848344a3..64e1856db 100755 --- a/ci/elixir-1.13/build_and_push.sh +++ b/ci/elixir-1.13/build_and_push.sh @@ -1 +1 @@ -docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.13.4-otp24 --push . +docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.13.4-otp-24 --push . -- cgit v1.2.3