summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-07-27 08:54:26 -0500
committerAlex Gleason <alex@alexgleason.me>2021-07-27 08:54:26 -0500
commit7f23dd6cc867e839ec721d34e3c114a68a5aed9e (patch)
treee1502ee85803ecc5050a213ab07cfb105d0ed41f /Dockerfile
parent9cc8642b80a3eceac405751a9c6b0be8e55db56d (diff)
parent7acdab1f305bac744a302e3b44e2e920d6bc8a47 (diff)
downloadpleroma-7f23dd6cc867e839ec721d34e3c114a68a5aed9e.tar.gz
pleroma-7f23dd6cc867e839ec721d34e3c114a68a5aed9e.zip
Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility
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 &&\