Merge branch 'ffmpeg' into 'develop'

Add ffmpeg to docker image See merge request pleroma/pleroma!3428
2021-05-30 17:42:48 +00:00 · 2021-05-30 17:42:48 +00:00 · 4a58cb469b
commit 4a58cb469b
parent 5d40ffe429 0204ceff7f
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -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 &&\