diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-08-05 09:43:24 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-08-05 11:11:24 -0500 |
| commit | b83758bd9634d4f2fb70a92159072dd44e49bb31 (patch) | |
| tree | 2452e8c4e1544fc9a0ad71292901b6cd52765566 /Dockerfile | |
| parent | 2b3d7794b23aac30cf8f977009d17b1abc602d19 (diff) | |
| parent | 5f5dc24027ee5cfadd226c5db2e2a2bdb0ababe0 (diff) | |
| download | pleroma-b83758bd9634d4f2fb70a92159072dd44e49bb31.tar.gz pleroma-b83758bd9634d4f2fb70a92159072dd44e49bb31.zip | |
Merge remote-tracking branch 'pleroma/develop' into moderators
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 &&\ |