diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-06-01 11:32:30 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-06-01 11:33:11 -0500 |
| commit | c435de426d045118ed7be3d77f659f349d2d2245 (patch) | |
| tree | a4cafffc0aa601c994dfd4c3a480dfd9dd5bfa3b /Dockerfile | |
| parent | 10dfe814795f16d6c32f5b6a7421e3e7c597f1ad (diff) | |
| parent | 75b94a2f352ea255b0785d0f3ba2c849c8355e04 (diff) | |
| download | pleroma-c435de426d045118ed7be3d77f659f349d2d2245.tar.gz pleroma-c435de426d045118ed7be3d77f659f349d2d2245.zip | |
Merge remote-tracking branch 'pleroma/develop' into cycles-constants
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 &&\ |