diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-09-16 14:40:17 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-09-16 14:40:17 +0300 |
| commit | 219dca1b00a60805545dd3de433de285cc944af5 (patch) | |
| tree | f8ffd4f93bf3f7bcd7ce0b789a18fb425134781a /Dockerfile | |
| parent | 736165c082d34ef4d52367ea8315c228a1df3944 (diff) | |
| parent | 409e701ab849475c81073d80a973487d67cadaae (diff) | |
| download | pleroma-219dca1b00a60805545dd3de433de285cc944af5.tar.gz pleroma-219dca1b00a60805545dd3de433de285cc944af5.zip | |
Merge branch 'develop' into feature/return-total-for-reports
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 |