projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
5d40ffe
)
Merge branch 'ffmpeg' into 'develop'
author
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Sun, 30 May 2021 17:42:48 +0000
(17:42 +0000)
committer
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Sun, 30 May 2021 17:42:48 +0000
(17:42 +0000)
Add ffmpeg to docker image
See merge request pleroma/pleroma!3428
Dockerfile
patch
|
blob
|
history
diff --git
a/Dockerfile
b/Dockerfile
index b1b5171af458f40f2997e613b1225cda0d424389..db1a6b45726ee35815f85a8926377eda9240df09 100644
(file)
--- 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 &&\