diff options
| author | Lain Soykaf <lain@lain.com> | 2021-12-26 16:41:17 +0100 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2021-12-26 16:41:17 +0100 |
| commit | 6efbd088546d7b95126b3100bca57b41e9482211 (patch) | |
| tree | efc8663deebf8df648e2c3ccb657742ce102d823 /Dockerfile | |
| parent | 4e98ba3c3a96548fe6d7fa8705898c660b788fea (diff) | |
| parent | 2e2fb5f8026a8d70f5d64dcc94f8253a5db24020 (diff) | |
| download | pleroma-6efbd088546d7b95126b3100bca57b41e9482211.tar.gz pleroma-6efbd088546d7b95126b3100bca57b41e9482211.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finch
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index db1a6b457..c51ebbab0 100644 --- 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,8 +31,7 @@ LABEL maintainer="ops@pleroma.social" \ ARG HOME=/opt/pleroma ARG DATA=/var/lib/pleroma -RUN echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories &&\ - apk update &&\ +RUN apk update &&\ apk add exiftool ffmpeg imagemagick libmagic ncurses postgresql-client &&\ adduser --system --shell /bin/false --home ${HOME} pleroma &&\ mkdir -p ${DATA}/uploads &&\ |