diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-06-01 16:17:43 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-06-01 16:17:43 -0500 |
| commit | 028017711cdb7966008a303058c0b3f72492f985 (patch) | |
| tree | c125f85bbe1047d1132227804fbe5ad9cfe76e5a /Dockerfile | |
| parent | 9879c18548c1b9f37df724259f65d5cd098f44c5 (diff) | |
| parent | 3fe6ada6fc6f42057cb346c04e4ecc9f35c0e5cb (diff) | |
| download | pleroma-028017711cdb7966008a303058c0b3f72492f985.tar.gz pleroma-028017711cdb7966008a303058c0b3f72492f985.zip | |
Merge remote-tracking branch 'pleroma/develop' into cycles-email
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 &&\ |