refactor: use get-pip.py to install pip (#11)

add requirement files for 3.12 and 3.13
update ci to keep the cache alive

Author: cesarcoatl

.github/workflows/autoupdate.yml

@@ -2,7 +2,8 @@ name: auto-update
 
 on:
   schedule:
-    - cron: '0 18 10 2-12/2 *'
+    - cron: '0 0 14,28 * *'
+    - cron: '0 0 10 2-12/2 *'
   workflow_dispatch:
 
 jobs:
@@ -13,6 +14,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Fetch latest Python 3.12 release
+        if: ${{ github.event.schedule == '0 18 10 2-12/2 *' || github.event_name == 'workflow_dispatch' }}
         run: |
           python_version=$(curl -s https://www.python.org/ftp/python/ | grep -oP '3\.12\.\d+/' | uniq | sort -V | tail -n 1 | tr -d '/')
 
@@ -23,6 +25,7 @@ jobs:
           sed -i "s/3\.12\.[0-9]\+\([-a-z]*\)/$python_version\1/g" README.md
 
       - name: Fetch latest Python 3.13 release
+        if: ${{ github.event.schedule == '0 18 10 2-12/2 *' || github.event_name == 'workflow_dispatch' }}
         run: |
           python_version=$(curl -s https://www.python.org/ftp/python/ | grep -oP '3\.13\.\d+/' | uniq | sort -V | tail -n 1 | tr -d '/')
 
@@ -32,6 +35,32 @@ jobs:
           sed -i "s/ENV PYTHON_VERSION=.*/ENV PYTHON_VERSION=$python_version/" 3.13/slim-bookworm/Dockerfile
           sed -i "s/3\.13\.[0-9]\+\([-a-z]*\)/$python_version\1/g" README.md
 
+      - name: Update requirements
+        uses: coatl-dev/actions/pip-compile@v3
+        with:
+          path: requirements/3.12
+          python-version: '3.12'
+
+      - name: Update requirements
+        uses: coatl-dev/actions/pip-compile@v3
+        with:
+          path: requirements/3.13
+          python-version: '3.13'
+
+      - name: Extract package versions and update Dockerfile
+        run: |
+          pip312=$(grep '^pip==' requirements/3.12/pip.txt | cut -d'=' -f3)
+          pip313=$(grep '^pip==' requirements/3.13/pip.txt | cut -d'=' -f3)
+
+          echo "Extracted versions:"
+          echo "pip3.12: $pip312"
+          echo "pip3.13: $pip313"
+
+          sed -i "s/ENV PYTHON_PIP_VERSION=.*/ENV PYTHON_PIP_VERSION=$pip312/" 3.12/bookworm/Dockerfile
+          sed -i "s/ENV PYTHON_PIP_VERSION=.*/ENV PYTHON_PIP_VERSION=$pip312/" 3.12/slim-bookworm/Dockerfile
+          sed -i "s/ENV PYTHON_PIP_VERSION=.*/ENV PYTHON_PIP_VERSION=$pip313/" 3.13/bookworm/Dockerfile
+          sed -i "s/ENV PYTHON_PIP_VERSION=.*/ENV PYTHON_PIP_VERSION=$pip313/" 3.13/slim-bookworm/Dockerfile
+
       - name: Detect changes
         id: git-diff
         uses: coatl-dev/actions/simple-git-diff@v3

.github/workflows/publish-3.12.yml

@@ -8,7 +8,7 @@ on:
       - '.github/workflows/publish-3.12.yml'
       - '3.12/**'
   schedule:
-    - cron: '0 20 14,28 * *'
+      - cron: '0 20 * * 1,5'
 
 jobs:
   tagger:

.github/workflows/publish-3.13.yml

@@ -2,13 +2,13 @@ name: publish-3.13
 
 on:
   push:
-      branches:
+    branches:
       - 'coatl'
-      paths:
+    paths:
       - '.github/workflows/publish-3.13.yml'
       - '3.13/**'
   schedule:
-      - cron: '0 20 14,28 * *'
+      - cron: '0 20 * * 0,4'
 
 jobs:
   tagger:
@@ -64,4 +64,4 @@ jobs:
       tags: ${{ matrix.image.tags }}
       username: ${{ vars.DOCKERHUB_USERNAME }}
     secrets:
-      password: ${{ secrets.DOCKERHUB_TOKEN }}
+      password: ${{ secrets.DOCKERHUB_TOKEN }}

2.7/bookworm/Dockerfile

@@ -26,7 +26,7 @@ RUN set -eux; \
     \
     apt-get update --quiet; \
     apt-get upgrade --yes; \
-	apt-get install --yes --no-install-recommends \
+	apt-get install -y --no-install-recommends \
 		tk-dev \
 	; \
 	rm -rf /var/lib/apt/lists/*
@@ -52,7 +52,7 @@ RUN set -eux; \
 		--enable-shared \
         --enable-unicode=ucs4 \
 	; \
-    make -s -j "$(nproc)" \
+    make -j "$(nproc)" \
 # setting PROFILE_TASK makes "--enable-optimizations" reasonable: https://bugs.python.org/issue36044 / https://github.com/docker-library/python/issues/160#issuecomment-509426916
         PROFILE_TASK='-m test.regrtest --pgo \
             test_array \

2.7/slim-bookworm/Dockerfile

@@ -27,7 +27,7 @@ RUN set -eux; \
     \
     apt-get update --quiet; \
     apt-get upgrade --yes; \
-	apt-get install --yes --no-install-recommends \
+	apt-get install -y --no-install-recommends \
 		ca-certificates \
 		netbase \
 		tzdata \
@@ -42,7 +42,7 @@ RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update --quiet; \
-	apt-get install --yes --no-install-recommends \
+	apt-get install -y --no-install-recommends \
 		dpkg-dev \
 		gcc \
 		gnupg \
@@ -76,7 +76,7 @@ RUN set -eux; \
 		--enable-shared \
         --enable-unicode=ucs4 \
 	; \
-    make -s -j "$(nproc)" \
+    make -j "$(nproc)" \
 # setting PROFILE_TASK makes "--enable-optimizations" reasonable: https://bugs.python.org/issue36044 / https://github.com/docker-library/python/issues/160#issuecomment-509426916
         PROFILE_TASK='-m test.regrtest --pgo \
             test_array \
@@ -127,7 +127,7 @@ RUN set -eux; \
 		| sort -u \
 		| xargs -r apt-mark manual \
 	; \
-	apt-get purge --yes --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	rm -rf /var/lib/apt/lists/*; \
 	\
 	cd /; \
@@ -150,14 +150,14 @@ RUN set -ex; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update --quiet; \
-	apt-get install --yes --no-install-recommends wget; \
+	apt-get install -y --no-install-recommends wget; \
 	\
 	wget -q -O get-pip.py "$PYTHON_GET_PIP_URL"; \
 	echo "$PYTHON_GET_PIP_SHA256 *get-pip.py" | sha256sum --check --strict -; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
-	apt-get purge --yes --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
 	rm -rf /var/lib/apt/lists/*; \
 	\
 	python get-pip.py \

3.12/bookworm/Dockerfile

@@ -48,20 +48,20 @@ RUN set -eux; \
 		--enable-shared \
 		--with-lto \
 		--with-system-expat \
-		--with-ensurepip \
+		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
 	EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
 	LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
-	make -s -j "$nproc" \
+	make -j "$nproc" \
 		"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
 		"LDFLAGS=${LDFLAGS:-}" \
 		"PROFILE_TASK=${PROFILE_TASK:-}" \
 	; \
 # https://github.com/docker-library/python/issues/784
 # prevent accidental usage of a system installed libpython of the same version
 	rm python; \
-	make -s -j "$nproc" \
+	make -j "$nproc" \
 		"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
 		"LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \
 		"PROFILE_TASK=${PROFILE_TASK:-}" \
@@ -88,17 +88,38 @@ RUN set -eux; \
 	ldconfig; \
 	\
 	export PYTHONDONTWRITEBYTECODE=1; \
-	python3 --version; \
-	pip3 --version
+	python3 --version
 
 # make some useful symlinks that are expected to exist ("/usr/local/bin/python" and friends)
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN set -eux; \
-	for src in idle3 pip3 pydoc3 python3 python3-config; do \
+	for src in idle3 pydoc3 python3 python3-config; do \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
 		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
+# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
+ENV PYTHON_PIP_VERSION=24.2
+# https://github.com/pypa/get-pip
+ENV PYTHON_GET_PIP_URL=https://raw.githubusercontent.com/pypa/get-pip/HEAD/public/get-pip.py
+
+RUN set -eux; \
+	\
+	wget -q -O get-pip.py "$PYTHON_GET_PIP_URL"; \
+	\
+	export PYTHONDONTWRITEBYTECODE=1; \
+	\
+	python get-pip.py \
+		--disable-pip-version-check \
+		--no-compile \
+		"pip==$PYTHON_PIP_VERSION" \
+		--no-setuptools \
+		--no-wheel \
+	; \
+	rm -f get-pip.py; \
+	\
+	pip --version
+
 CMD ["python3"]

3.12/slim-bookworm/Dockerfile

@@ -75,21 +75,21 @@ RUN set -eux; \
 		--enable-shared \
 		--with-lto \
 		--with-system-expat \
-		--with-ensurepip \
+		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
 	EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
 	LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
 	LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
-	make -s -j "$nproc" \
+	make -j "$nproc" \
 		"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
 		"LDFLAGS=${LDFLAGS:-}" \
 		"PROFILE_TASK=${PROFILE_TASK:-}" \
 	; \
 # https://github.com/docker-library/python/issues/784
 # prevent accidental usage of a system installed libpython of the same version
 	rm python; \
-	make -s -j "$nproc" \
+	make -j "$nproc" \
 		"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
 		"LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \
 		"PROFILE_TASK=${PROFILE_TASK:-}" \
@@ -123,16 +123,46 @@ RUN set -eux; \
 	rm -rf /var/lib/apt/lists/*; \
 	\
 	export PYTHONDONTWRITEBYTECODE=1; \
-	python3 --version; \
-	pip3 --version
+	python3 --version
 
 # make some useful symlinks that are expected to exist ("/usr/local/bin/python" and friends)
 RUN set -eux; \
-	for src in idle3 pip3 pydoc3 python3 python3-config; do \
+	for src in idle3 pydoc3 python3 python3-config; do \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
 		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
+# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
+ENV PYTHON_PIP_VERSION=24.2
+# https://github.com/pypa/get-pip
+ENV PYTHON_GET_PIP_URL=https://raw.githubusercontent.com/pypa/get-pip/HEAD/public/get-pip.py
+
+RUN set -eux; \
+	\
+	savedAptMark="$(apt-mark showmanual)"; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends wget; \
+	\
+	wget -q -O get-pip.py "$PYTHON_GET_PIP_URL"; \
+	\
+	apt-mark auto '.*' > /dev/null; \
+	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*; \
+	\
+	export PYTHONDONTWRITEBYTECODE=1; \
+	\
+	python get-pip.py \
+		--disable-pip-version-check \
+		--no-compile \
+		"pip==$PYTHON_PIP_VERSION" \
+		--no-setuptools \
+		--no-wheel \
+	; \
+	rm -f get-pip.py; \
+	\
+	pip --version
+
 CMD ["python3"]

3.13/bookworm/Dockerfile

@@ -43,20 +43,20 @@ RUN set -eux; \
 		--enable-shared \
 		--with-lto \
 		--with-system-expat \
-		--with-ensurepip \
+		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
 	EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
 	LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
-	make -s -j "$nproc" \
+	make -j "$nproc" \
 		"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
 		"LDFLAGS=${LDFLAGS:-}" \
 		"PROFILE_TASK=${PROFILE_TASK:-}" \
 	; \
 # https://github.com/docker-library/python/issues/784
 # prevent accidental usage of a system installed libpython of the same version
 	rm python; \
-	make -s -j "$nproc" \
+	make -j "$nproc" \
 		"EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
 		"LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \
 		"PROFILE_TASK=${PROFILE_TASK:-}" \
@@ -83,17 +83,38 @@ RUN set -eux; \
 	ldconfig; \
 	\
 	export PYTHONDONTWRITEBYTECODE=1; \
-	python3 --version; \
-	pip3 --version
+	python3 --version
 
 # make some useful symlinks that are expected to exist ("/usr/local/bin/python" and friends)
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN set -eux; \
-	for src in idle3 pip3 pydoc3 python3 python3-config; do \
+	for src in idle3 pydoc3 python3 python3-config; do \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
 		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
+# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
+ENV PYTHON_PIP_VERSION=24.2
+# https://github.com/pypa/get-pip
+ENV PYTHON_GET_PIP_URL=https://raw.githubusercontent.com/pypa/get-pip/HEAD/public/get-pip.py
+
+RUN set -eux; \
+	\
+	wget -q -O get-pip.py "$PYTHON_GET_PIP_URL"; \
+	\
+	export PYTHONDONTWRITEBYTECODE=1; \
+	\
+	python get-pip.py \
+		--disable-pip-version-check \
+		--no-compile \
+		"pip==$PYTHON_PIP_VERSION" \
+		--no-setuptools \
+		--no-wheel \
+	; \
+	rm -f get-pip.py; \
+	\
+	pip --version
+
 CMD ["python3"]