diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-06-04 21:12:37 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-06-04 21:12:37 -0500 |
| commit | 3be08e7c2ec8b77e02e3d0572227221d68163df0 (patch) | |
| tree | 0f1d9ab79c29060edd3f95c4795e634a10d1a5a3 /Dockerfile | |
| parent | 1c3fe43d231428fee392afd726363193fdcb8008 (diff) | |
| parent | 94687e23938b808a3fff95c92956ec337160cd0b (diff) | |
| download | pleroma-3be08e7c2ec8b77e02e3d0572227221d68163df0.tar.gz pleroma-3be08e7c2ec8b77e02e3d0572227221d68163df0.zip | |
Merge remote-tracking branch 'pleroma/develop' into cycles-reverse-proxy
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index b1b5171af..db1a6b457 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 exiftool imagemagick libmagic ncurses postgresql-client &&\ + 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 &&\ |