diff options
| author | feld <feld@feld.me> | 2020-11-21 18:29:26 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-11-21 18:29:26 +0000 |
| commit | 15550f7c4bf75401d0f18add0f847f640acc6627 (patch) | |
| tree | 0594b692b63aac7c99b59769e1d448bf336ce503 | |
| parent | 9fc3356a06158c21c7e113552de4bcf2a6426df7 (diff) | |
| parent | 9b7ade65685002d5a50ddec4d0c6d2c4dc29c208 (diff) | |
| download | pleroma-15550f7c4bf75401d0f18add0f847f640acc6627.tar.gz | |
Merge branch 'cherry-pick-a65fc78c' into 'stable'
Dockerfile fixes for stable
See merge request pleroma/pleroma!3169
| -rw-r--r-- | Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index aa50e27ec..b1b5171af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ COPY . . ENV MIX_ENV=prod -RUN apk add git gcc g++ musl-dev make cmake &&\ +RUN apk add git gcc g++ musl-dev make cmake file-dev &&\ echo "import Mix.Config" > config/prod.secret.exs &&\ mix local.hex --force &&\ mix local.rebar --force &&\ @@ -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 ncurses postgresql-client &&\ + apk add exiftool imagemagick libmagic ncurses postgresql-client &&\ adduser --system --shell /bin/false --home ${HOME} pleroma &&\ mkdir -p ${DATA}/uploads &&\ mkdir -p ${DATA}/static &&\ |