From 33ca4f88876c749ff61d1bbca46566cd5423ce75 Mon Sep 17 00:00:00 2001 From: feederbox826 <144178721+feederbox826@users.noreply.github.com> Date: Mon, 28 Oct 2024 19:14:52 -0400 Subject: [PATCH] remove bencoder.pyx, update vips (#5416) * remove bencoder.pyx * revert vips downgrade --------- Co-authored-by: feederbox826 --- docker/ci/x86_64/Dockerfile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/docker/ci/x86_64/Dockerfile b/docker/ci/x86_64/Dockerfile index 2c7fb0d8d..f0f1e242b 100644 --- a/docker/ci/x86_64/Dockerfile +++ b/docker/ci/x86_64/Dockerfile @@ -12,15 +12,9 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm/v6" ]; then BIN=stash-linux-arm32v6; \ FROM --platform=$TARGETPLATFORM alpine:latest AS app COPY --from=binary /stash /usr/bin/ -# vips version 8.15.0-r0 breaks thumbnail generation on arm32v6 -# need to use 8.14.3-r0 from alpine 3.18 instead - -RUN apk add --no-cache --virtual .build-deps gcc python3-dev musl-dev \ - && apk add --no-cache ca-certificates python3 py3-requests py3-requests-toolbelt py3-lxml py3-pip ffmpeg ruby tzdata \ - && apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.18/community vips=8.14.3-r0 vips-tools=8.14.3-r0 \ - && pip install --user --break-system-packages mechanicalsoup cloudscraper bencoder.pyx stashapp-tools \ - && gem install faraday \ - && apk del .build-deps +RUN apk add --no-cache ca-certificates python3 py3-requests py3-requests-toolbelt py3-lxml py3-pip ffmpeg ruby tzdata vips vips-tools \ + && pip install --user --break-system-packages mechanicalsoup cloudscraper stashapp-tools \ + && gem install faraday ENV STASH_CONFIG_FILE=/root/.stash/config.yml # Basic build-time metadata as defined at https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys