summaryrefslogtreecommitdiff
path: root/ci/Dockerfile
diff options
context:
space:
mode:
authormarcin mikołajczak <git@mkljczk.pl>2023-12-22 14:34:30 +0100
committermarcin mikołajczak <git@mkljczk.pl>2023-12-22 14:34:30 +0100
commit6051715a990b7eb4379daec46d5ea0d63dce2c09 (patch)
treee53a6e689839a188e1dd8770e19135fb28bf8a0b /ci/Dockerfile
parent5846e7d5f6b91ab63270f2104543d874589d39ca (diff)
parent5f1d70736711275ac9f0c95e5ada4cb2f1a96e11 (diff)
downloadpleroma-6051715a990b7eb4379daec46d5ea0d63dce2c09.tar.gz
pleroma-6051715a990b7eb4379daec46d5ea0d63dce2c09.zip
Merge remote-tracking branch 'origin/develop' into instance_rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'ci/Dockerfile')
-rw-r--r--ci/Dockerfile7
1 files changed, 4 insertions, 3 deletions
diff --git a/ci/Dockerfile b/ci/Dockerfile
index e6a8b438c..a2b566873 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -1,7 +1,8 @@
-FROM elixir:1.9.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
RUN apt-get update &&\
- apt-get install -y libmagic-dev cmake libimage-exiftool-perl ffmpeg &&\
+ apt-get install -y libmagic-dev cmake libimage-exiftool-perl ffmpeg &&\
mix local.hex --force &&\
mix local.rebar --force
-