diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-05-30 17:42:48 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-05-30 17:42:48 +0000 |
| commit | 4a58cb469bf2732c3d8dce06764fcd9232367c2c (patch) | |
| tree | 890552db0f1934794404a56895c0697e3bedeeef | |
| parent | 5d40ffe429caa21eab33951457bb314677753866 (diff) | |
| parent | 0204ceff7f66cffd87f06926ad856742940e02ff (diff) | |
Merge branch 'ffmpeg' into 'develop'
Add ffmpeg to docker image
See merge request pleroma/pleroma!3428
| -rw-r--r-- | Dockerfile | 2 |
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 &&\ |