diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-07-14 09:02:55 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-07-14 09:02:55 -0500 |
| commit | 1a2fe96d56350dc685eb53112630af567de8d5bd (patch) | |
| tree | 31f5c24d81ab1a226776158d4bb1a62ef72c8834 /Dockerfile | |
| parent | 167e14416bec2846d3282a121cfcfd147a04a8bf (diff) | |
| parent | 173e977e283789a814278c63bc81f40a13942e21 (diff) | |
| download | pleroma-1a2fe96d56350dc685eb53112630af567de8d5bd.tar.gz pleroma-1a2fe96d56350dc685eb53112630af567de8d5bd.zip | |
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date
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 &&\ |