diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2021-12-25 00:52:02 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2021-12-25 00:52:02 +0100 |
| commit | 9775955974171c19e2dd9e6930e96e33f25cb4db (patch) | |
| tree | 498b0572f6edb8d09acb471b6b557de6ca9bc638 /Dockerfile | |
| parent | cd5fb84b76a51fe6c7b5d672298a87c34737c303 (diff) | |
| parent | 1fa616638b8823a6cc0d67d0354cc179da5943f8 (diff) | |
| download | pleroma-9775955974171c19e2dd9e6930e96e33f25cb4db.tar.gz pleroma-9775955974171c19e2dd9e6930e96e33f25cb4db.zip | |
Merge remote-tracking branch 'origin/develop' into remote-follow-api
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
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 &&\ |