diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-05 11:30:41 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-05 11:30:41 +0300 |
| commit | 79cf629e1a3610a93f5b9349c18a4464eb859d3d (patch) | |
| tree | 2644e0a58d11de74c350f4557778110d744b9441 /Dockerfile | |
| parent | eb17cc17a146471d3774fc2b972128dd75eb05af (diff) | |
| parent | 3e30f6e19824dc90717fc0929feddb24220a89ab (diff) | |
| download | pleroma-79cf629e1a3610a93f5b9349c18a4464eb859d3d.tar.gz pleroma-79cf629e1a3610a93f5b9349c18a4464eb859d3d.zip | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
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 |