Commit 4a58cb46 authored by Haelwenn's avatar Haelwenn
Browse files

Merge branch 'ffmpeg' into 'develop'

Add ffmpeg to docker image

See merge request !3428
parents 5d40ffe4 0204ceff
Pipeline #36215 failed with stages
in 10 minutes and 55 seconds
......@@ -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 &&\
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment