summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-07-13 22:47:47 -0500
committerAlex Gleason <alex@alexgleason.me>2021-07-13 22:47:47 -0500
commitdeb3f911366925bcc342a4a0deb44a2e7da7f1ba (patch)
treec8e587198f64c4c5f991a05561943c6bd0af465b /Dockerfile
parent5e88796784e0ac2dbf57d9cf954fdc8ae8aeae43 (diff)
parent173e977e283789a814278c63bc81f40a13942e21 (diff)
downloadpleroma-deb3f911366925bcc342a4a0deb44a2e7da7f1ba.tar.gz
pleroma-deb3f911366925bcc342a4a0deb44a2e7da7f1ba.zip
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
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 &&\