pleroma

commit: 4a58cb469bf2732c3d8dce06764fcd9232367c2c
parent 5d40ffe429caa21eab33951457bb314677753866
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Sun, 30 May 2021 17:42:48 +0000

Merge branch 'ffmpeg' into 'develop'

Add ffmpeg to docker image

See merge request pleroma/pleroma!3428
Diffstat:
M
Dockerfile
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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 &&\