aboutsummaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-06-17 15:38:10 -0500
committerAlex Gleason <alex@alexgleason.me>2021-06-17 15:38:10 -0500
commit3a03d9b65f96099e7c7a831469532c2cec7294c6 (patch)
tree46d84731c3a53157117fc4c8141fdf6b3d7b8b25 /Dockerfile
parenta704d5499c03cb5609ea38a5f2ef06095ced3ef3 (diff)
parenta8adc300d4cfc88ef19f1977e32068437ed4ad00 (diff)
downloadpleroma-nsfw-api-mrf.tar.gz
Merge remote-tracking branch 'pleroma/develop' into nsfw-api-mrfnsfw-api-mrf
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile2
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 &&\