diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-07-18 11:36:41 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-07-18 11:49:22 -0500 |
| commit | 62bf6d67e393d2b290d226e8505d622d944c9a26 (patch) | |
| tree | e1503a97fcc551b1495e3c98b2acc889e8a48299 /Dockerfile | |
| parent | 70f1496eb861650d16310205cef1957fcd201948 (diff) | |
| parent | 3f58213646238aeca542e2f69ef3bbf0105eaa5d (diff) | |
| download | pleroma-62bf6d67e393d2b290d226e8505d622d944c9a26.tar.gz pleroma-62bf6d67e393d2b290d226e8505d622d944c9a26.zip | |
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
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 &&\ |