From 4a418698db71016447f2f246f7c5579b3dc0b08c Mon Sep 17 00:00:00 2001
From: Ashlynn Anderson <pea@pea.sh>
Date: Fri, 2 Aug 2019 22:28:48 -0400
Subject: Create docker.exs and docker-entrypoint + round out Dockerfile

At this point, the implementation is completely working and has been
tested running live and federating with other instances.
---
 Dockerfile | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 667c01b39..2f438c952 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM rinpatch/elixir:1.9.0-rc.0-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 &&\
@@ -15,18 +15,27 @@ RUN mix deps.get --only prod &&\
 
 FROM alpine:latest
 
+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 &&\
+RUN 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"]
-- 
cgit v1.2.3