diff options
| author | Lain Soykaf <lain@lain.com> | 2023-12-12 12:29:22 +0400 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2023-12-12 12:29:22 +0400 |
| commit | 8da1fd329d29baae7b8bcb84d831f3bcbcc3219b (patch) | |
| tree | 2a16a25b42842b91b8208f78017284a1f9d8c5dc | |
| parent | 228966e6dd1bd4a01d0c01609d9f6ad2279d278f (diff) | |
| parent | e9d9caa77c2c940b89e10ca202ab7625d13ccfca (diff) | |
| download | pleroma-8da1fd329d29baae7b8bcb84d831f3bcbcc3219b.tar.gz pleroma-8da1fd329d29baae7b8bcb84d831f3bcbcc3219b.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into no-async-clear-config
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | changelog.d/fix-dockerfile.skip | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index 13d8a85ac..bfddfcb7b 100644 --- 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 new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/fix-dockerfile.skip |