diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-06-01 14:20:31 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-06-01 14:20:31 -0500 |
| commit | f6d2bd738d6cf4c495ba8fcd311ebf4705cf4343 (patch) | |
| tree | 2c952a181713d063c91ec5e67c757903e08fd21b /Dockerfile | |
| parent | 8a5ceb7e53f1817f83a72b997f6b9daa7070972b (diff) | |
| parent | ee52fc840d4d6eb1caab811a9b00ab1b95662d77 (diff) | |
| download | pleroma-f6d2bd738d6cf4c495ba8fcd311ebf4705cf4343.tar.gz pleroma-f6d2bd738d6cf4c495ba8fcd311ebf4705cf4343.zip | |
Merge remote-tracking branch 'pleroma/develop' into cycles-uploader
Diffstat (limited to 'Dockerfile')
| -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 &&\ |