diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2024-01-31 22:19:33 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-01-31 22:19:33 +0100 |
| commit | 226e53fdd73e95483efec08d11f6fae217b68f45 (patch) | |
| tree | de3c09b6d5c625d41db8ef6fa54de74f642c2363 /Dockerfile | |
| parent | 9363ef53a34c9d96191bccaece76dd4e01f493b6 (diff) | |
| parent | 3b9d991514e53ad8f442ffc674dd9b1422fdc415 (diff) | |
| download | pleroma-226e53fdd73e95483efec08d11f6fae217b68f45.tar.gz pleroma-226e53fdd73e95483efec08d11f6fae217b68f45.zip | |
Merge remote-tracking branch 'origin/develop' into status-notification-type
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile index 8c3ff3ac5..69c3509de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,16 @@ -ARG ELIXIR_VER=1.11.4 +ARG ELIXIR_IMG=hexpm/elixir +ARG ELIXIR_VER=1.12.3 ARG ERLANG_VER=24.2.1 ARG ALPINE_VER=3.17.0 -FROM hexpm/elixir:${ELIXIR_VER}-erlang-${ERLANG_VER}-alpine-${ALPINE_VER} as build +FROM ${ELIXIR_IMG}:${ELIXIR_VER}-erlang-${ERLANG_VER}-alpine-${ALPINE_VER} as build COPY . . ENV MIX_ENV=prod +ENV VIX_COMPILATION_MODE=PLATFORM_PROVIDED_LIBVIPS -RUN apk add git gcc g++ musl-dev make cmake file-dev &&\ +RUN apk add git gcc g++ musl-dev make cmake file-dev vips-dev &&\ echo "import Config" > config/prod.secret.exs &&\ mix local.hex --force &&\ mix local.rebar --force &&\ @@ -36,7 +38,7 @@ ARG HOME=/opt/pleroma ARG DATA=/var/lib/pleroma RUN apk update &&\ - apk add exiftool ffmpeg imagemagick libmagic ncurses postgresql-client &&\ + apk add exiftool ffmpeg vips libmagic ncurses postgresql-client &&\ adduser --system --shell /bin/false --home ${HOME} pleroma &&\ mkdir -p ${DATA}/uploads &&\ mkdir -p ${DATA}/static &&\ @@ -48,7 +50,7 @@ USER pleroma COPY --from=build --chown=pleroma:0 /release ${HOME} -COPY ./config/docker.exs /etc/pleroma/config.exs +COPY --chown=pleroma --chmod=640 ./config/docker.exs /etc/pleroma/config.exs COPY ./docker-entrypoint.sh ${HOME} EXPOSE 4000 |