summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-03-31 19:36:04 +0000
committerfeld <feld@feld.me>2020-03-31 19:36:04 +0000
commitfa38089f169de60799971f4ed1b22aff99235c31 (patch)
treecb5a837322598007f8aa4ffc4d4fd54007dd39f9
parent8bd5ad8664479b722e6905306f6342f35e2a84d2 (diff)
parentf6dc33615bb6a27cd0a963bb8a610bb30bd6d619 (diff)
downloadpleroma-fa38089f169de60799971f4ed1b22aff99235c31.tar.gz
pleroma-fa38089f169de60799971f4ed1b22aff99235c31.zip
Merge branch 'fix/docker-mogrify' into 'develop'
Fix/docker mogrify Closes #1644 See merge request pleroma/pleroma!2337
-rw-r--r--Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 4f7f12716..b21f86fcd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,7 +33,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 &&\