diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-02 14:47:17 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-02 14:47:17 +0300 |
| commit | dbcfac11b45b367185a3b18a2db3e3fb07e8f20d (patch) | |
| tree | 039254a94616f04f4ea00e893bf0fb66dc06d9e8 /Dockerfile | |
| parent | dfd2c741849e9afaf35e3ddbecbb50feb47f5d22 (diff) | |
| parent | fd932b14a7e7335a91a2acc2d6dd6fba7e2e90b3 (diff) | |
| download | pleroma-dbcfac11b45b367185a3b18a2db3e3fb07e8f20d.tar.gz pleroma-dbcfac11b45b367185a3b18a2db3e3fb07e8f20d.zip | |
Merge branch 'develop' into issue/1276
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 &&\ |