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

[akkoma] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 667c01b39435c4f607aba69598fc7caf3877b971..c61dcfde91251915289159b6663fe51b944c2bd9 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,32 +1,39 @@
-FROM rinpatch/elixir:1.9.0-rc.0-alpine as build
+FROM elixir:1.9-alpine as build
 
 COPY . .
 
-ENV MIX_ENV prod
+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 /opt/pleroma pleroma &&\
-       mkdir -p /var/lib/pleroma/uploads &&\
-       chown -R pleroma /var/lib/pleroma &&\
-       mkdir -p /var/lib/pleroma/static &&\
-       chown -R pleroma /var/lib/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} &&\
        mkdir -p /etc/pleroma &&\
        chown -R pleroma /etc/pleroma
 
 USER pleroma
 
-COPY --from=build --chown=pleroma:0 /release/ /opt/pleroma/
+COPY --from=build --chown=pleroma:0 /release ${HOME}
+
+COPY ./config/docker.exs /etc/pleroma/config.exs
+COPY ./docker-entrypoint.sh ${HOME}
+
+EXPOSE 4000
+
+ENTRYPOINT ["/opt/pleroma/docker-entrypoint.sh"]