diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-12-19 12:55:36 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-12-19 12:55:36 -0600 |
| commit | 3f8fc34593414f6e35925038c38775203333b3f3 (patch) | |
| tree | b11c6c15246dbaa8f0cd1d382d6cb762196c2b1b /Dockerfile | |
| parent | e311c60923432f30fc4ab7bd37d338d60f40e25f (diff) | |
| parent | 50892a198d14a628c37139761b709cd5e3261a23 (diff) | |
| download | pleroma-3f8fc34593414f6e35925038c38775203333b3f3.tar.gz pleroma-3f8fc34593414f6e35925038c38775203333b3f3.zip | |
Merge remote-tracking branch 'origin/develop' into moderators
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index db1a6b457..c51ebbab0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apk add git gcc g++ musl-dev make cmake file-dev &&\ mkdir release &&\ mix release --path release -FROM alpine:3.11 +FROM alpine:3.14 ARG BUILD_DATE ARG VCS_REF @@ -31,8 +31,7 @@ LABEL maintainer="ops@pleroma.social" \ ARG HOME=/opt/pleroma ARG DATA=/var/lib/pleroma -RUN echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories &&\ - apk update &&\ +RUN apk update &&\ apk add exiftool ffmpeg imagemagick libmagic ncurses postgresql-client &&\ adduser --system --shell /bin/false --home ${HOME} pleroma &&\ mkdir -p ${DATA}/uploads &&\ |