diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-07-27 08:29:53 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-07-27 08:29:53 -0500 |
| commit | 33a19c002a9196cb67d3379d5237f9490c957f1b (patch) | |
| tree | ba6cbd601f1c20560d627677b1332324898fb01f /Dockerfile | |
| parent | 94db0b7cd604022c65b9f70e5c5a939ac3ed4801 (diff) | |
| parent | 7acdab1f305bac744a302e3b44e2e920d6bc8a47 (diff) | |
| download | pleroma-33a19c002a9196cb67d3379d5237f9490c957f1b.tar.gz pleroma-33a19c002a9196cb67d3379d5237f9490c957f1b.zip | |
Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix
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 &&\ |