diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-07-17 15:03:43 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-07-17 15:03:43 -0500 |
| commit | 3674179b26b3351e34f527b7e267a5ff0f551c2e (patch) | |
| tree | ef705aed9e5ea92bfe5de04e1353d365b842e94e /Dockerfile | |
| parent | bad79f79e65dc9b093f364393b802c67d632a5c6 (diff) | |
| parent | 3f58213646238aeca542e2f69ef3bbf0105eaa5d (diff) | |
| download | pleroma-3674179b26b3351e34f527b7e267a5ff0f551c2e.tar.gz pleroma-3674179b26b3351e34f527b7e267a5ff0f551c2e.zip | |
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
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 &&\ |