diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-10 14:18:57 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-10 14:18:57 +0400 |
| commit | cf2a0574e77ed207453215ae83377a3eb8f2fa0c (patch) | |
| tree | fdc89909325238b71c8fc07a63d8720e432434c4 /Dockerfile | |
| parent | 4a2538967caf5b0f9970cc5f973c16ea5d776aa3 (diff) | |
| parent | ce089615e1e89fbb63b0c0548906f3b6c22abac2 (diff) | |
| download | pleroma-cf2a0574e77ed207453215ae83377a3eb8f2fa0c.tar.gz pleroma-cf2a0574e77ed207453215ae83377a3eb8f2fa0c.zip | |
Merge branch 'develop' into fix/support-conversations-pagination
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index 4f7f12716..29931a5e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apk add git gcc g++ musl-dev make &&\ mkdir release &&\ mix release --path release -FROM alpine:3.9 +FROM alpine:3.11 ARG BUILD_DATE ARG VCS_REF @@ -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 &&\ |
