diff options
author | Mark Felder <feld@feld.me> | 2024-06-09 08:37:24 -0400 |
---|---|---|
committer | Mark Felder <feld@feld.me> | 2024-06-09 08:37:24 -0400 |
commit | 51eeb8082257c152f26a3abed68c009fd3d1e262 (patch) | |
tree | 5b50750df36fb701305b6e33e82d954092694165 /ci/elixir-1.15-otp25 | |
parent | f000dab372993e1cbd494535b82c248d44595ab5 (diff) | |
parent | de80a7e8906cb54b436a2f6a754b05c4eae13d79 (diff) | |
download | pleroma-51eeb8082257c152f26a3abed68c009fd3d1e262.tar.gz pleroma-51eeb8082257c152f26a3abed68c009fd3d1e262.zip |
Merge remote-tracking branch 'origin/develop' into webpush-polls
Diffstat (limited to 'ci/elixir-1.15-otp25')
-rw-r--r-- | ci/elixir-1.15-otp25/Dockerfile | 8 | ||||
-rwxr-xr-x | ci/elixir-1.15-otp25/build_and_push.sh | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/ci/elixir-1.15-otp25/Dockerfile b/ci/elixir-1.15-otp25/Dockerfile deleted file mode 100644 index 3335c6e36..000000000 --- a/ci/elixir-1.15-otp25/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100755 index a28e0d33c..000000000 --- a/ci/elixir-1.15-otp25/build_and_push.sh +++ /dev/null @@ -1 +0,0 @@ -docker buildx build --platform linux/amd64,linux/arm64 -t git.pleroma.social:5050/pleroma/pleroma/ci-base:elixir-1.15-otp25 --push . |