Merge branch 'fix-otp-version-file-in-docker' into 'develop'

[akkoma] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 4f7f127168da21240e47e18e3635d3d11d021b0c..c2f3ad98c9a3478a360ff836c2ab219ab4eadc73 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,9 @@ RUN apk add git gcc g++ musl-dev make &&\
        mkdir release &&\
        mix release --path release
 
-FROM alpine:3.9
+RUN echo "${OTP_VERSION}" > release/OTP_VERSION
+
+FROM alpine:3.11
 
 ARG BUILD_DATE
 ARG VCS_REF
@@ -33,7 +35,7 @@ ARG DATA=/var/lib/pleroma
 
 RUN echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories &&\
        apk update &&\
-       apk add ncurses postgresql-client &&\
+       apk add imagemagick ncurses postgresql-client &&\
        adduser --system --shell /bin/false --home ${HOME} pleroma &&\
        mkdir -p ${DATA}/uploads &&\
        mkdir -p ${DATA}/static &&\