commit: 8da1fd329d29baae7b8bcb84d831f3bcbcc3219b
parent 228966e6dd1bd4a01d0c01609d9f6ad2279d278f
Author: Lain Soykaf <lain@lain.com>
Date: Tue, 12 Dec 2023 12:29:22 +0400
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into no-async-clear-config
Diffstat:
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
@@ -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 &&\
diff --git a/changelog.d/fix-dockerfile.skip b/changelog.d/fix-dockerfile.skip