diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-09-10 01:23:20 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-09-10 01:23:20 +0300 |
| commit | d1abf7a3585e4bc1ebea4f615ae2e149d5a56918 (patch) | |
| tree | b76a8bacf53300bcd4816b3018311c23c51368c0 /Dockerfile | |
| parent | 3542ca6702707ace070761c57350c10cd8c2a745 (diff) | |
| parent | ceb2e09126a48fa341d5ff84371db49ae022bc12 (diff) | |
| download | pleroma-d1abf7a3585e4bc1ebea4f615ae2e149d5a56918.tar.gz pleroma-d1abf7a3585e4bc1ebea4f615ae2e149d5a56918.zip | |
Merge branch 'develop' into feature/moderation-log-filters
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index 268ec61dc..c61dcfde9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rinpatch/elixir:1.9.0-rc.0-alpine as build +FROM elixir:1.9-alpine as build COPY . . @@ -12,7 +12,7 @@ RUN apk add git gcc g++ musl-dev make &&\ mkdir release &&\ mix release --path release -FROM alpine:latest +FROM alpine:3.9 ARG HOME=/opt/pleroma ARG DATA=/var/lib/pleroma |