Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup

[akkoma] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 4e7c01c5d458b1b907862d6e64b3426a002f9052..c51ebbab04755d161d1f1305b0ad8a4112f28a49 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ RUN apk add git gcc g++ musl-dev make cmake file-dev &&\
        mkdir release &&\
        mix release --path release
 
-FROM alpine:3.11
+FROM alpine:3.14
 
 ARG BUILD_DATE
 ARG VCS_REF
@@ -31,9 +31,8 @@ LABEL maintainer="ops@pleroma.social" \
 ARG HOME=/opt/pleroma
 ARG DATA=/var/lib/pleroma
 
-RUN echo "https://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories &&\
-       apk update &&\
-       apk add exiftool imagemagick ncurses postgresql-client &&\
+RUN apk update &&\
+       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 &&\