diff options
| author | Lain Soykaf <lain@lain.com> | 2024-05-27 20:03:14 +0400 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2024-05-27 20:03:14 +0400 |
| commit | f4c0a01f097ec9d6d61dff3abfcda616b23e01e6 (patch) | |
| tree | e821106c60e3180005be5add7a18dbe569171a74 /Dockerfile | |
| parent | 197647a04e66c1af3ae691a4507612fdbee9c48c (diff) | |
| parent | 7798fdc71121459f479e0729fefdac195b1dca7d (diff) | |
| download | pleroma-f4c0a01f097ec9d6d61dff3abfcda616b23e01e6.tar.gz pleroma-f4c0a01f097ec9d6d61dff3abfcda616b23e01e6.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into image-description-summary
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Dockerfile b/Dockerfile index 8c3ff3ac5..72461305c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,16 @@ -ARG ELIXIR_VER=1.11.4 -ARG ERLANG_VER=24.2.1 -ARG ALPINE_VER=3.17.0 +ARG ELIXIR_IMG=hexpm/elixir +ARG ELIXIR_VER=1.13.4 +ARG ERLANG_VER=24.3.4.15 +ARG ALPINE_VER=3.17.5 -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 |