diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-07 22:13:43 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-07 22:13:43 +0300 |
| commit | 39f99dc6cd9295e1b62b27ed1566d53c8c0291fc (patch) | |
| tree | 48e0f59948462378451f09fc4307777d5080e58b /Dockerfile | |
| parent | ae506ca997619f118d18703a9b0802246eb427d5 (diff) | |
| parent | c45013df8e53334bcc1afb8cd1df673c290037ee (diff) | |
| download | pleroma-39f99dc6cd9295e1b62b27ed1566d53c8c0291fc.tar.gz pleroma-39f99dc6cd9295e1b62b27ed1566d53c8c0291fc.zip | |
Merge branch 'develop' into support/tests
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 |