Archive Debian 12 and Fedora 42

.github/workflows/build.yml

@@ -29,11 +29,8 @@ jobs:
           - "arch"
           - "centos-stream-9-amd64"
           - "centos-stream-10-amd64"
-          - "debian-12-bookworm-x86"
-          - "debian-12-bookworm-amd64"
           - "debian-13-trixie-x86"
           - "debian-13-trixie-amd64"
-          - "fedora-42-amd64"
           - "gentoo"
           - "ubuntu-22.04-jammy-amd64"
           - "ubuntu-22.04-jammy-amd64-valgrind"

Makefile

@@ -4,11 +4,8 @@ TARGETS = \
 	arch \
 	centos-stream-9-amd64 \
 	centos-stream-10-amd64 \
-	debian-12-bookworm-x86 \
-	debian-12-bookworm-amd64 \
 	debian-13-trixie-x86 \
 	debian-13-trixie-amd64 \
-	fedora-42-amd64 \
 	fedora-43-amd64 \
 	gentoo \
 	manylinux_2_28-wheel-build \

archive/debian-12-bookworm-x86/Dockerfile

@@ -31,12 +31,14 @@ RUN echo '#!/bin/sh' > /usr/sbin/policy-rc.d \
 # Pillow customization
 #
 
-RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+RUN apt-get -qq update \
+    && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
     cmake \
-    curl \
+    g++ \
     ghostscript \
     git \
-    libffi-dev \
     libfreetype6-dev \
     libfribidi-dev \
     libharfbuzz-dev \
@@ -48,6 +50,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     libwebp-dev \
     libssl-dev \
     meson \
+    nasm \
     netpbm \
     python3-dev \
     python3-numpy \
@@ -58,24 +61,30 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     tk8.6-dev \
     virtualenv \
     wget \
+    xauth \
     xvfb \
     zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-host=i686-unknown-linux-gnu
+RUN wget -qO- https://sh.rustup.rs | sh -s -- -y --default-host=i686-unknown-linux-gnu
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-RUN useradd pillow \
+RUN useradd -u 1001 pillow \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow
 
+ARG PIP_DISABLE_PIP_VERSION_CHECK=1
+ARG PIP_NO_CACHE_DIR=1
+
 RUN virtualenv -p /usr/bin/python3.11 --system-site-packages /vpy3 \
-    && /vpy3/bin/pip install --no-cache-dir --upgrade pip \
-    && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov pytest-timeout \
+    && /vpy3/bin/pip install --upgrade pip \
+    && /vpy3/bin/pip install olefile pytest pytest-cov pytest-timeout \
     && chown -R pillow:pillow /vpy3
 
-ADD depends /depends
-RUN cd /depends && ./install_imagequant.sh && ./install_raqm.sh
+COPY depends /depends
+RUN cd /depends && ./install_imagequant.sh && ./install_libavif.sh && ./install_raqm.sh
+
+ENV FORCE_COLOR=1
 
 USER pillow
 ENTRYPOINT ["linux32"]

archive/debian-12-bookworm-x86/test.sh

@@ -4,5 +4,4 @@ cd /Pillow
 export DISPLAY=:99.0
 make clean
 make install-coverage
-python3 -c "from PIL import Image"
-/usr/bin/xvfb-run -a pytest -vx --cov PIL --cov-report term Tests
+/usr/bin/xvfb-run -a .ci/test.sh