summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-06-30 02:02:30 -0500
committerAlex Gleason <alex@alexgleason.me>2021-06-30 02:02:30 -0500
commit99cc26bb02f2ac7ab26aa761ee5427406830a778 (patch)
tree6e2be1eef0179a001eedbe1aeb23825a535245a6 /Dockerfile
parentbeb1c98ab5e0848127a4490180364552f6fcdbf5 (diff)
parent5717256ebab1a8927e9e5889aa4629148aa39fb6 (diff)
downloadpleroma-99cc26bb02f2ac7ab26aa761ee5427406830a778.tar.gz
pleroma-99cc26bb02f2ac7ab26aa761ee5427406830a778.zip
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
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 &&\