diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-12-25 19:57:53 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-12-25 19:57:53 -0600 |
| commit | db2bf55e9bb31af2ed34805ca7fa98ce67b471b1 (patch) | |
| tree | f532711eaf19111e22375e87706edf5a3024e5b5 /Dockerfile | |
| parent | b15c4629ff3093353ac5e37d381db1cdc4da1c3a (diff) | |
| parent | 73609211a425922a5068d3912a36b82abe24e12c (diff) | |
| download | pleroma-db2bf55e9bb31af2ed34805ca7fa98ce67b471b1.tar.gz pleroma-db2bf55e9bb31af2ed34805ca7fa98ce67b471b1.zip | |
Merge remote-tracking branch 'origin/develop' into notice-routes
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile index b1b5171af..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,9 +31,8 @@ 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 &&\ - apk add exiftool imagemagick libmagic ncurses postgresql-client &&\ +RUN apk update &&\ + apk add exiftool ffmpeg imagemagick libmagic ncurses postgresql-client &&\ adduser --system --shell /bin/false --home ${HOME} pleroma &&\ mkdir -p ${DATA}/uploads &&\ mkdir -p ${DATA}/static &&\ |