summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-09-06 14:01:07 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-09-06 14:01:07 +0300
commiteb74c3d5c7a4bebbee43e123661d87e7605a32ba (patch)
tree5a034ddf84ce2fb0bb72501b146df967299c3685 /Dockerfile
parent6ef0103ca0b194971a2e6f61685316536b742a11 (diff)
parent896ffabe37406e85c2a3c2f30d2e882c68b5831e (diff)
downloadpleroma-eb74c3d5c7a4bebbee43e123661d87e7605a32ba.tar.gz
pleroma-eb74c3d5c7a4bebbee43e123661d87e7605a32ba.zip
Merge branch 'develop' into issue/1218
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile4
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