fixes

Author: mosquito

.github/workflows/docker-image.yml

@@ -66,8 +66,6 @@ jobs:
         image:
           - context: "all"
             tag: "all"
-          - context: "python3.8"
-            tag: "3.8"
           - context: "python3.9"
             tag: "3.9"
           - context: "python3.10"
@@ -121,8 +119,6 @@ jobs:
 
       matrix:
         image:
-          - context: pillow/3.8
-            tag: 3.8-pillow
           - context: pillow/3.9
             tag: 3.9-pillow
           - context: pillow/3.10

Makefile

@@ -7,13 +7,11 @@ endef
 images: build-base \
 		build-all \
 		build-pillow-all \
-		build-python-3.8 \
 		build-python-3.9 \
 		build-python-3.10 \
 		build-python-3.11 \
 		build-python-3.12 \
 		build-python-3.13 \
-		build-pillow-3.8 \
 		build-pillow-3.9 \
 		build-pillow-3.10 \
 		build-pillow-3.11 \
@@ -32,9 +30,6 @@ build-base:
 build-all: build-base
 	$(call build,all,all:latest)
 
-build-python-3.8:
-	$(call build,python3.8,3.8:latest)
-
 build-python-3.9:
 	$(call build,python3.9,3.9:latest)
 
@@ -53,9 +48,6 @@ build-python-3.13:
 build-pillow-all:
 	$(call build,pillow/all,all-pillow)
 
-build-pillow-3.8:
-	$(call build,pillow/3.8,3.8-pillow)
-
 build-pillow-3.9:
 	$(call build,pillow/3.9,3.9-pillow)
 

all/Dockerfile

@@ -16,11 +16,10 @@ RUN apt-install \
     python3-virtualenv \
     python-is-python3
 
-RUN apt-install -y python3.8 python3.8-dev python3.8-venv
 RUN apt-install -y python3.9 python3.9-dev python3.9-venv
-RUN apt-install -y python3.10 python3.10-dev python3.10-venv python3.10-distutils
-RUN apt-install -y python3.11 python3.11-dev python3.11-venv python3.11-distutils
-RUN apt-install -y python3.12 python3.12-dev python3.12-venv python3.12-distutils
+RUN apt-install -y python3.10 python3.10-dev python3.10-venv
+RUN apt-install -y python3.11 python3.11-dev python3.11-venv
+RUN apt-install -y python3.12 python3.12-dev python3.12-venv
 RUN apt-install -y python3.13 python3.13-dev python3.13-venv python3.13-nogil
 
 RUN apt-install \
@@ -38,7 +37,6 @@ RUN apt-install \
 RUN ln -snf /dev/shm /root/.cargo
 
 RUN \
-    python3.8 /usr/share/python/get-pip.py "pip == 24.0" "setuptools < 60" "wheel == 0.37.0" "cython" && \
     python3.9 /usr/share/python/get-pip.py "pip == 24.0" "setuptools < 60" "wheel == 0.37.0" "cython" && \
     python3.10 /usr/share/python/get-pip.py "pip == 24.0" "setuptools < 60" "wheel == 0.37.0" "cython" && \
     python3.11 /usr/share/python/get-pip.py "pip == 24.0" "setuptools < 60" "wheel == 0.37.0" "cython" && \

base/Dockerfile

@@ -1,9 +1,9 @@
 FROM ubuntu:jammy
 
-ENV DEBIAN_FRONTEND noninteractive
-ENV TZ Etc/UTC
+ENV DEBIAN_FRONTEND=noninteractive
+ENV TZ=Etc/UTC
 
-ENV LANG en_US.UTF-8
+ENV LANG=en_US.UTF-8
 
 COPY sources.list /etc/apt/sources.list
 COPY apt.conf /etc/apt/apt.conf.d/snakepacker

pillow/3.12/Dockerfile

@@ -27,4 +27,4 @@ RUN find-libdeps /var/tmp/pillow-venv > /usr/share/python3/pillow-runtime-libs.t
 
 FROM ghcr.io/snakepacker/python/3.12
 COPY --from=builder /usr/share/python3/pillow-runtime-libs.txt /usr/share/python3/pillow-runtime-libs.txt
-RUN xargs -ra /usr/share/python3/pillow-runtime-libs.txt apt-install
+RUN xargs -ra /usr/share/python3/pillow-runtime-libs.txt apt-install

pillow/3.8/Dockerfile

@@ -1,4 +1,4 @@
 FROM ghcr.io/snakepacker/python/base
 
 # Install python
-RUN apt-install python3.12-minimal libpython3.12-stdlib python3.12-distutils
+RUN apt-install python3.12 libpython3.12-stdlib

python3.12/Dockerfile

@@ -1,4 +1,4 @@
 FROM ghcr.io/snakepacker/python/base
 
 # Install python
-RUN apt-install python3.13-minimal libpython3.13-stdlib python3.13-nogil
+RUN apt-install python3.13 libpython3.13-stdlib python3.13-nogil