X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=Dockerfile;h=29931a5e3a398cd2fef9cb0e244da7db5725ce1f;hb=aa0a4a1e78655024e992f9c677efed45593ab7b8;hp=667c01b39435c4f607aba69598fc7caf3877b971;hpb=7efca4317b568c408a10b71799f9b8261ac5e8e6;p=akkoma

diff --git a/Dockerfile b/Dockerfile
index 667c01b39..29931a5e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,32 +1,53 @@
-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.11
+
+ARG BUILD_DATE
+ARG VCS_REF
+
+LABEL maintainer="ops@pleroma.social" \
+    org.opencontainers.image.title="pleroma" \
+    org.opencontainers.image.description="Pleroma for Docker" \
+    org.opencontainers.image.authors="ops@pleroma.social" \
+    org.opencontainers.image.vendor="pleroma.social" \
+    org.opencontainers.image.documentation="https://git.pleroma.social/pleroma/pleroma" \
+    org.opencontainers.image.licenses="AGPL-3.0" \
+    org.opencontainers.image.url="https://pleroma.social" \
+    org.opencontainers.image.revision=$VCS_REF \
+    org.opencontainers.image.created=$BUILD_DATE
+
+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 imagemagick 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"]