summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-05-31 16:49:46 -0500
committerAlex Gleason <alex@alexgleason.me>2021-05-31 16:49:46 -0500
commitf2134e605b44c300505f81adab01354a1652b2e5 (patch)
tree47ddcf95309646ea005bc9a5b085b1f5e58755e6 /Dockerfile
parent51a9f97e87823cbd9e92c375f4bc4c0bfa8b79db (diff)
parenta0ba44904a9cdf6dea100e5a91bc30b34485d32d (diff)
downloadpleroma-f2134e605b44c300505f81adab01354a1652b2e5.tar.gz
pleroma-f2134e605b44c300505f81adab01354a1652b2e5.zip
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
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 &&\