Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into no-async-clear-config

2023-12-12 12:29:22 +04:00 · 2023-12-12 12:29:22 +04:00 · 8da1fd329d
parent 228966e6dd e9d9caa77c
commit 8da1fd329d
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