Merge branch 'develop' into stable

[akkoma] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index c210cf79c777629bdb32425540626adcc4faa8fb..c6506c48c5aa2920ddc6a9b1569aa2ea31626fb8 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,53 +1,34 @@
-FROM elixir:1.9-alpine as build
-
-COPY . .
+FROM hexpm/elixir:1.14.3-erlang-25.3-alpine-3.17.2
 
 ENV MIX_ENV=prod
+ENV ERL_EPMD_ADDRESS=127.0.0.1
+
+ARG HOME=/opt/akkoma
 
-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 &&\
-       mix deps.get --only prod &&\
-       mkdir release &&\
-       mix release --path release
-
-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" \
+LABEL org.opencontainers.image.title="akkoma" \
+    org.opencontainers.image.description="Akkoma for Docker" \
+    org.opencontainers.image.vendor="akkoma.dev" \
+    org.opencontainers.image.documentation="https://docs.akkoma.dev/stable/" \
     org.opencontainers.image.licenses="AGPL-3.0" \
-    org.opencontainers.image.url="https://pleroma.social" \
+    org.opencontainers.image.url="https://akkoma.dev" \
     org.opencontainers.image.revision=$VCS_REF \
     org.opencontainers.image.created=$BUILD_DATE
 
-ARG HOME=/opt/pleroma
-ARG DATA=/var/lib/pleroma
+RUN apk add git gcc g++ musl-dev make cmake file-dev exiftool ffmpeg imagemagick libmagic ncurses postgresql-client
 
-RUN echo "https://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories &&\
-       apk update &&\
-       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} &&\
-       mkdir -p /etc/pleroma &&\
-       chown -R pleroma /etc/pleroma
+EXPOSE 4000
 
-USER pleroma
+ARG UID=1000
+ARG GID=1000
+ARG UNAME=akkoma
 
-COPY --from=build --chown=pleroma:0 /release ${HOME}
+RUN addgroup -g $GID $UNAME
+RUN adduser -u $UID -G $UNAME -D -h $HOME $UNAME
 
-COPY ./config/docker.exs /etc/pleroma/config.exs
-COPY ./docker-entrypoint.sh ${HOME}
+WORKDIR /opt/akkoma
 
-EXPOSE 4000
+USER $UNAME
+RUN mix local.hex --force &&\
+    mix local.rebar --force
 
-ENTRYPOINT ["/opt/pleroma/docker-entrypoint.sh"]
+CMD ["/opt/akkoma/docker-entrypoint.sh"]