diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-07-12 16:23:06 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-07-12 16:23:06 -0500 |
| commit | e40b58fd563d327727fb3f304a5d1a55b2f6f2e4 (patch) | |
| tree | 8ae773cf3b60c62fcd8096ed787da72440edc7a5 /Dockerfile | |
| parent | 9a0cb34c8c3a3c47ad5074bd73ad5369ee852192 (diff) | |
| parent | 173e977e283789a814278c63bc81f40a13942e21 (diff) | |
| download | pleroma-e40b58fd563d327727fb3f304a5d1a55b2f6f2e4.tar.gz pleroma-e40b58fd563d327727fb3f304a5d1a55b2f6f2e4.zip | |
Merge remote-tracking branch 'pleroma/develop' into fix-object-deletion-timeout
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 &&\ |