summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-08-04 11:48:57 -0500
committerAlex Gleason <alex@alexgleason.me>2021-08-04 11:48:57 -0500
commit44ede0657f2da0a761de76b1f9822a293430d497 (patch)
tree387a8915bdb6ff1295f4f0872b2e6bc97e177831 /Dockerfile
parent1f093cb216ed0d6b0d23b05e1ffbbf55dc72bbee (diff)
parentd8a986c9e893de8eed3aa336a557695669b1ffee (diff)
downloadpleroma-44ede0657f2da0a761de76b1f9822a293430d497.tar.gz
pleroma-44ede0657f2da0a761de76b1f9822a293430d497.zip
Merge remote-tracking branch 'pleroma/develop' into staff-plug
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 &&\