X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=Dockerfile;h=c210cf79c777629bdb32425540626adcc4faa8fb;hb=6877bad44cccff807cf8d1426c26ab80a6ea0244;hp=2f438c952cb49626bfa11ab6ae72c65c90b4f9ce;hpb=4a418698db71016447f2f246f7c5579b3dc0b08c;p=akkoma

diff --git a/Dockerfile b/Dockerfile
index 2f438c952..c210cf79c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,40 @@
-FROM rinpatch/elixir:1.9.0-rc.0-alpine as build
+FROM elixir:1.9-alpine as build
 
 COPY . .
 
 ENV MIX_ENV=prod
 
-RUN apk add git gcc g++ musl-dev make &&\
+RUN apk add git gcc g++ musl-dev make cmake &&\
 	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 &&\
+RUN echo "https://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 exiftool imagemagick ncurses postgresql-client &&\
+	adduser --system --shell /bin/false --home ${HOME} pleroma &&\
 	mkdir -p ${DATA}/uploads &&\
 	mkdir -p ${DATA}/static &&\
 	chown -R pleroma ${DATA} &&\