diff options
| author | feld <feld@feld.me> | 2021-06-07 20:06:36 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-06-07 20:06:36 +0000 |
| commit | 84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa (patch) | |
| tree | 80664a6152e92abb37133fede9e3ed72c6801910 /Dockerfile | |
| parent | 4ca380490f1e42ef6b12c4b12ba9efabb89472fd (diff) | |
| parent | 64bc0c69ed6b77283905b04585f03c23cbedbe03 (diff) | |
| download | pleroma-84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa.tar.gz pleroma-84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa.zip | |
Merge branch 'develop' into 'fix/prune-hashtags'
# Conflicts:
# CHANGELOG.md
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 &&\ |