Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 2f438c952cb49626bfa11ab6ae72c65c90b4f9ce..c61dcfde91251915289159b6663fe51b944c2bd9 100644 (file)
--- 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 . .
 
@@ -7,22 +7,20 @@ ENV MIX_ENV=prod
 RUN apk add git gcc g++ musl-dev make &&\
        echo "import Mix.Config" > config/prod.secret.exs &&\
        mix local.hex --force &&\
-       mix local.rebar --force
-
-RUN mix deps.get --only prod &&\
+       mix local.rebar --force &&\
+       mix deps.get --only prod &&\
        mkdir release &&\
        mix release --path release
 
-FROM alpine:latest
+FROM alpine:3.9
 
 ARG HOME=/opt/pleroma
 ARG DATA=/var/lib/pleroma
 
 RUN echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories &&\
        apk update &&\
-       apk add ncurses postgresql-client
-
-RUN adduser --system --shell /bin/false --home ${HOME} pleroma &&\
+       apk add ncurses postgresql-client &&\
+       adduser --system --shell /bin/false --home ${HOME} pleroma &&\
        mkdir -p ${DATA}/uploads &&\
        mkdir -p ${DATA}/static &&\
        chown -R pleroma ${DATA} &&\