Merge pull request #205 from radarhere/ubuntu24_04

.github/workflows/build.yml

@@ -17,10 +17,10 @@ jobs:
         image:
           # Run slower jobs first to give them a headstart and reduce waiting time
           - "ubuntu-22.04-jammy-arm64v8"
-          - "ubuntu-22.04-jammy-ppc64le"
-          - "ubuntu-22.04-jammy-s390x"
+          - "ubuntu-24.04-noble-ppc64le"
+          - "ubuntu-24.04-noble-s390x"
           # test image for manylinux-wheel build
-          - "ubuntu-22.04-jammy-amd64"
+          - "ubuntu-24.04-noble-amd64"
           # Then run the remainder
           - "alpine"
           - "amazon-2-amd64"
@@ -34,6 +34,7 @@ jobs:
           - "fedora-40-amd64"
           - "gentoo"
           - "ubuntu-20.04-focal-amd64"
+          - "ubuntu-22.04-jammy-amd64"
           - "ubuntu-22.04-jammy-amd64-valgrind"
           # has a dependency on the test image
           - "manylinux2014-wheel-build"
@@ -45,9 +46,9 @@ jobs:
             test-image: "ubuntu-22.04-jammy-amd64"
           - image: "ubuntu-22.04-jammy-arm64v8"
             qemu-arch: "aarch64"
-          - image: "ubuntu-22.04-jammy-ppc64le"
+          - image: "ubuntu-24.04-noble-ppc64le"
             qemu-arch: "ppc64le"
-          - image: "ubuntu-22.04-jammy-s390x"
+          - image: "ubuntu-24.04-noble-s390x"
             qemu-arch: "s390x"
 
     steps:
@@ -69,7 +70,7 @@ jobs:
             git submodule update --remote Pillow
           fi
           (cd Pillow && git checkout main)
-          sudo chown -R 1000 $(pwd)
+          sudo chown -R 1001 $(pwd)
 
       - name: Test Image Build
         if: "matrix.test-image"

Makefile

@@ -14,10 +14,11 @@ TARGETS = \
 	manylinux_2_28-wheel-build \
 	ubuntu-20.04-focal-amd64 \
 	ubuntu-22.04-jammy-amd64 \
+	ubuntu-24.04-noble-amd64 \
 	ubuntu-22.04-jammy-amd64-valgrind \
 	ubuntu-22.04-jammy-arm64v8 \
-	ubuntu-22.04-jammy-ppc64le \
-	ubuntu-22.04-jammy-s390x
+	ubuntu-24.04-noble-ppc64le \
+	ubuntu-24.04-noble-s390x
 
 BUILDDIRS = $(TARGETS:%=build-%)
 PUSHDIRS = $(TARGETS:%=push-%)

alpine/Dockerfile

@@ -40,7 +40,7 @@ RUN cd /depends \
     && ./install_imagequant.sh \
     && ./install_raqm.sh
 
-RUN /usr/sbin/adduser -D pillow \
+RUN /usr/sbin/adduser -D --uid 1001 pillow \
     && virtualenv /vpy3 \
     && /vpy3/bin/pip install --no-cache-dir --upgrade pip \
     && /vpy3/bin/pip install --no-cache-dir olefile pytest pytest-cov pytest-timeout \

amazon-2-amd64/Dockerfile

@@ -35,7 +35,7 @@ RUN yum install -y \
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-RUN useradd --uid 1000 pillow
+RUN useradd --uid 1001 pillow
 
 RUN wget https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tgz \
     && tar xzf Python-3.9.16.tgz \

amazon-2023-amd64/Dockerfile

@@ -36,7 +36,7 @@ RUN yum install -y \
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-RUN useradd --uid 1000 pillow
+RUN useradd --uid 1001 pillow
 
 RUN bash -c "/usr/bin/pip3 install virtualenv \
     && /usr/bin/python3 -mvirtualenv -p /usr/bin/python3 --system-site-packages /vpy3 \

arch/Dockerfile

@@ -41,7 +41,7 @@ RUN cd /depends \
      && ./install_imagequant.sh \
      && ./install_raqm.sh
 
-RUN /sbin/useradd -m -U -u 1000 pillow \
+RUN /sbin/useradd -m -U --uid 1001 pillow \
     && virtualenv --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 \

centos-stream-9-amd64/Dockerfile

@@ -33,7 +33,7 @@ RUN yum install -y \
     zlib-devel \
     && yum clean all
 
-RUN useradd --uid 1000 pillow
+RUN useradd --uid 1001 pillow
 
 RUN bash -c "python3.9 -m pip install virtualenv \
     && python3.9 -m virtualenv --system-site-packages /vpy3 \

debian-11-bullseye-amd64/Dockerfile

@@ -65,7 +65,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow

debian-12-bookworm-amd64/Dockerfile

@@ -65,7 +65,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow
 

debian-12-bookworm-x86/Dockerfile

@@ -65,7 +65,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
 RUN curl --proto '=https' --tlsv1.2 -sSf 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
 

fedora-39-amd64/Dockerfile

@@ -25,7 +25,7 @@ RUN dnf install -y \
     zlib-devel \
     && dnf clean all
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && chown pillow:pillow /home/pillow
 
 RUN virtualenv -p /usr/bin/python3.12 --system-site-packages /vpy3 \

fedora-40-amd64/Dockerfile

@@ -25,7 +25,7 @@ RUN dnf install -y \
     zlib-devel \
     && dnf clean all
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && chown pillow:pillow /home/pillow
 
 RUN virtualenv -p /usr/bin/python3.12 --system-site-packages /vpy3 \

gentoo/Dockerfile

@@ -27,7 +27,7 @@ RUN emerge --quiet dev-python/virtualenv dev-util/cargo-c dev-build/meson x11-mi
 RUN USE="jpeg jpeg2k lcms tiff truetype webp xcb zlib" emerge --quiet --onlydeps dev-python/pillow
 RUN emerge --quiet app-text/ghostscript-gpl dev-python/numpy
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && chown pillow:pillow /home/pillow
 
 RUN virtualenv --system-site-packages /vpy3 \

ubuntu-20.04-focal-amd64/Dockerfile

@@ -43,7 +43,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow

ubuntu-22.04-jammy-amd64-valgrind/Dockerfile

@@ -33,7 +33,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     valgrind \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow

ubuntu-22.04-jammy-amd64/Dockerfile

@@ -40,7 +40,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow

ubuntu-22.04-jammy-arm64v8/Dockerfile

@@ -31,7 +31,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow

ubuntu-24.04-noble-amd64/Dockerfile

@@ -0,0 +1,60 @@
+FROM ubuntu:noble
+
+RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
+    cmake \
+    ghostscript \
+    git \
+    libegl-dev \
+    libffi-dev \
+    libfreetype6-dev \
+    libfribidi-dev \
+    libharfbuzz-dev \
+    libimagequant-dev \
+    libjpeg-turbo-progs \
+    libjpeg8-dev \
+    liblcms2-dev \
+    libopengl-dev \
+    libopenjp2-7-dev \
+    libssl-dev \
+    libtiff5-dev \
+    libwebp-dev \
+    libxcb-cursor0 \
+    libxcb-icccm4 \
+    libxcb-image0 \
+    libxcb-keysyms1 \
+    libxcb-randr0 \
+    libxcb-render-util0 \
+    libxcb-shape0 \
+    libxkbcommon-x11-0 \
+    meson \
+    netpbm \
+    python3-dev \
+    python3-numpy \
+    python3-setuptools \
+    python3-tk \
+    sudo \
+    tcl8.6-dev \
+    tk8.6-dev \
+    virtualenv \
+    wget \
+    xvfb \
+    zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN useradd pillow \
+    && mkdir /home/pillow \
+    && chown pillow:pillow /home/pillow
+
+RUN virtualenv -p /usr/bin/python3.12 --system-site-packages /vpy3 \
+    && /vpy3/bin/pip install --no-cache-dir --upgrade pip \
+    && /vpy3/bin/pip install --no-cache-dir cffi olefile pyside6 pytest pytest-cov pytest-timeout \
+    && chown -R pillow:pillow /vpy3
+
+ADD depends /depends
+RUN cd /depends \
+    && ./install_raqm.sh
+
+USER pillow
+CMD ["depends/test.sh"]
+
+#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-24.04-noble-amd64

ubuntu-24.04-noble-amd64/Makefile

@@ -0,0 +1 @@
+../Makefile.sub

ubuntu-24.04-noble-amd64/test.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+source /vpy3/bin/activate
+cd /Pillow
+make clean
+make install-coverage
+python3 -c "from PIL import Image"
+/usr/bin/xvfb-run -a pytest -vx --cov PIL --cov-report term Tests

ubuntu-24.04-noble-amd64/update.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+docker pull ubuntu:noble

ubuntu-24.04-noble-ppc64le/Dockerfile

@@ -0,0 +1,50 @@
+FROM ppc64le/ubuntu:noble
+
+RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
+    cmake \
+    ghostscript \
+    git \
+    libffi-dev \
+    libfreetype6-dev \
+    libfribidi-dev \
+    libharfbuzz-dev \
+    libimagequant-dev \
+    libjpeg-turbo-progs \
+    libjpeg8-dev \
+    liblcms2-dev \
+    libopenjp2-7-dev \
+    libssl-dev \
+    libtiff5-dev \
+    libwebp-dev \
+    meson \
+    netpbm \
+    python3-dev \
+    python3-numpy \
+    python3-setuptools \
+    python3-tk \
+    sudo \
+    tcl8.6-dev \
+    tk8.6-dev \
+    virtualenv \
+    wget \
+    xvfb \
+    zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN useradd pillow \
+    && mkdir /home/pillow \
+    && chown pillow:pillow /home/pillow
+
+RUN virtualenv -p /usr/bin/python3.12 --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 \
+    && chown -R pillow:pillow /vpy3
+
+ADD depends /depends
+RUN cd /depends \
+    && ./install_raqm.sh
+
+USER pillow
+CMD ["depends/test.sh"]
+
+#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-24.04-noble-ppc64le

ubuntu-24.04-noble-ppc64le/Makefile

@@ -0,0 +1 @@
+../Makefile.sub

ubuntu-24.04-noble-ppc64le/test.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+source /vpy3/bin/activate
+cd /Pillow
+make clean
+make install-coverage
+/usr/bin/xvfb-run -a pytest -vx --cov PIL --cov-report term Tests

ubuntu-24.04-noble-ppc64le/update.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+docker pull ppc64le/ubuntu:noble

ubuntu-24.04-noble-s390x/Dockerfile

@@ -0,0 +1,49 @@
+FROM s390x/ubuntu:noble
+
+RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
+    cmake \
+    ghostscript \
+    git \
+    libffi-dev \
+    libfreetype6-dev \
+    libfribidi-dev \
+    libharfbuzz-dev \
+    libimagequant-dev \
+    libjpeg-turbo-progs \
+    libjpeg8-dev \
+    liblcms2-dev \
+    libopenjp2-7-dev \
+    libtiff5-dev \
+    meson \
+    netpbm \
+    python3-dev \
+    python3-numpy \
+    python3-setuptools \
+    python3-tk \
+    sudo \
+    tcl8.6-dev \
+    tk8.6-dev \
+    virtualenv \
+    wget \
+    xvfb \
+    zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN useradd pillow \
+    && mkdir /home/pillow \
+    && chown pillow:pillow /home/pillow
+
+RUN virtualenv -p /usr/bin/python3.12 --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 \
+    && chown -R pillow:pillow /vpy3
+
+ADD depends /depends
+RUN cd /depends \
+    && ./install_raqm.sh \
+    && ./install_webp.sh
+
+USER pillow
+CMD ["depends/test.sh"]
+
+#docker run -v $GITHUB_WORKSPACE:/Pillow pythonpillow/ubuntu-24.04-noble-s390x

ubuntu-24.04-noble-s390x/Makefile

@@ -0,0 +1 @@
+../Makefile.sub

ubuntu-24.04-noble-s390x/test.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+source /vpy3/bin/activate
+cd /Pillow
+make clean
+make install-coverage
+/usr/bin/xvfb-run -a pytest -vx --cov PIL --cov-report term Tests

ubuntu-24.04-noble-s390x/update.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+docker pull s390x/ubuntu:noble