Merge branch 'fix-dockerfile' into 'develop'

Dockerfile: Use platform libvips. See merge request pleroma/pleroma!3995
2023-12-12 08:11:33 +00:00 · 2023-12-12 08:11:33 +00:00 · e9d9caa77c
parent 3c89f3cf15 7371e72e6c
commit e9d9caa77c
2 changed files with 2 additions and 1 deletions
--- a/3
+++ b/3
@ -8,8 +8,9 @@ FROM ${ELIXIR_IMG}:${ELIXIR_VER}-erlang-${ERLANG_VER}-alpine-${ALPINE_VER} as bu
 COPY . .

 ENV MIX_ENV=prod
+ENV VIX_COMPILATION_MODE=PLATFORM_PROVIDED_LIBVIPS

-RUN apk add git gcc g++ musl-dev make cmake file-dev rust &&\
+RUN apk add git gcc g++ musl-dev make cmake file-dev vips &&\
 	echo "import Config" > config/prod.secret.exs &&\
 	mix local.hex --force &&\
 	mix local.rebar --force &&\
--- a/changelog.d/fix-dockerfile.skip
+++ b/changelog.d/fix-dockerfile.skip