Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pypy #11992

Merged
merged 1 commit into from
Mar 8, 2022
Merged

Update pypy #11992

merged 1 commit into from
Mar 8, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented Mar 8, 2022

Changes:

Changes:

- docker-library/pypy@f25deee: Merge pull request docker-library/pypy#73 from infosiftr/versions.json
- docker-library/pypy@70b03f0: Switch to using the upstream-provided "versions.json" file
@github-actions
Copy link

github-actions bot commented Mar 8, 2022

Diff for 1e61f9e:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index aa09185..7fe5304 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,112 +3,112 @@ GitRepo: https://github.com/docker-library/pypy.git
 
 Tags: 2.7-7.3.8-bullseye, 2.7-7.3-bullseye, 2.7-7-bullseye, 2.7-bullseye, 2-7.3.8-bullseye, 2-7.3-bullseye, 2-7-bullseye, 2-bullseye
 SharedTags: 2.7-7.3.8, 2.7-7.3, 2.7-7, 2.7, 2-7.3.8, 2-7.3, 2-7, 2
-Architectures: amd64, i386
-GitCommit: 4d46082ae0ff2771a80e4089ae9e58916134f2b1
+Architectures: amd64, arm64v8, i386
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 2.7/bullseye
 
 Tags: 2.7-7.3.8-buster, 2.7-7.3-buster, 2.7-7-buster, 2.7-buster, 2-7.3.8-buster, 2-7.3-buster, 2-7-buster, 2-buster
-Architectures: amd64, i386
-GitCommit: 4d46082ae0ff2771a80e4089ae9e58916134f2b1
+Architectures: amd64, arm64v8, i386, s390x
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 2.7/buster
 
 Tags: 2.7-7.3.8-slim, 2.7-7.3-slim, 2.7-7-slim, 2.7-slim, 2-7.3.8-slim, 2-7.3-slim, 2-7-slim, 2-slim, 2.7-7.3.8-slim-bullseye, 2.7-7.3-slim-bullseye, 2.7-7-slim-bullseye, 2.7-slim-bullseye, 2-7.3.8-slim-bullseye, 2-7.3-slim-bullseye, 2-7-slim-bullseye, 2-slim-bullseye
-Architectures: amd64, i386
-GitCommit: 4d46082ae0ff2771a80e4089ae9e58916134f2b1
+Architectures: amd64, arm64v8, i386
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 2.7/slim-bullseye
 
 Tags: 2.7-7.3.8-slim-buster, 2.7-7.3-slim-buster, 2.7-7-slim-buster, 2.7-slim-buster, 2-7.3.8-slim-buster, 2-7.3-slim-buster, 2-7-slim-buster, 2-slim-buster
-Architectures: amd64, i386
-GitCommit: 4d46082ae0ff2771a80e4089ae9e58916134f2b1
+Architectures: amd64, arm64v8, i386, s390x
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 2.7/slim-buster
 
 Tags: 2.7-7.3.8-windowsservercore-1809, 2.7-7.3-windowsservercore-1809, 2.7-7-windowsservercore-1809, 2.7-windowsservercore-1809, 2-7.3.8-windowsservercore-1809, 2-7.3-windowsservercore-1809, 2-7-windowsservercore-1809, 2-windowsservercore-1809
 SharedTags: 2.7-7.3.8, 2.7-7.3, 2.7-7, 2.7, 2-7.3.8, 2-7.3, 2-7, 2, 2.7-7.3.8-windowsservercore, 2.7-7.3-windowsservercore, 2.7-7-windowsservercore, 2.7-windowsservercore, 2-7.3.8-windowsservercore, 2-7.3-windowsservercore, 2-7-windowsservercore, 2-windowsservercore
 Architectures: windows-amd64
-GitCommit: 4d46082ae0ff2771a80e4089ae9e58916134f2b1
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 2.7/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
 Tags: 3.7-7.3.8-bullseye, 3.7-7.3-bullseye, 3.7-7-bullseye, 3.7-bullseye
 SharedTags: 3.7-7.3.8, 3.7-7.3, 3.7-7, 3.7
-Architectures: amd64, i386
-GitCommit: fc08343eb14924fc1748b5ad4260ce6ba3ae00ac
+Architectures: amd64, arm64v8, i386
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.7/bullseye
 
 Tags: 3.7-7.3.8-buster, 3.7-7.3-buster, 3.7-7-buster, 3.7-buster
-Architectures: amd64, i386, s390x
-GitCommit: fc08343eb14924fc1748b5ad4260ce6ba3ae00ac
+Architectures: amd64, arm64v8, i386, s390x
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.7/buster
 
 Tags: 3.7-7.3.8-slim, 3.7-7.3-slim, 3.7-7-slim, 3.7-slim, 3.7-7.3.8-slim-bullseye, 3.7-7.3-slim-bullseye, 3.7-7-slim-bullseye, 3.7-slim-bullseye
-Architectures: amd64, i386
-GitCommit: fc08343eb14924fc1748b5ad4260ce6ba3ae00ac
+Architectures: amd64, arm64v8, i386
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.7/slim-bullseye
 
 Tags: 3.7-7.3.8-slim-buster, 3.7-7.3-slim-buster, 3.7-7-slim-buster, 3.7-slim-buster
-Architectures: amd64, i386, s390x
-GitCommit: fc08343eb14924fc1748b5ad4260ce6ba3ae00ac
+Architectures: amd64, arm64v8, i386, s390x
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.7/slim-buster
 
 Tags: 3.7-7.3.8-windowsservercore-1809, 3.7-7.3-windowsservercore-1809, 3.7-7-windowsservercore-1809, 3.7-windowsservercore-1809
 SharedTags: 3.7-7.3.8, 3.7-7.3, 3.7-7, 3.7, 3.7-7.3.8-windowsservercore, 3.7-7.3-windowsservercore, 3.7-7-windowsservercore, 3.7-windowsservercore
 Architectures: windows-amd64
-GitCommit: 1520fc1d0d4d141c70504e6c6b8065b346aea1df
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.7/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
 Tags: 3.8-7.3.8-bullseye, 3.8-7.3-bullseye, 3.8-7-bullseye, 3.8-bullseye, 3-7.3.8-bullseye, 3-7.3-bullseye, 3-7-bullseye, 3-bullseye, bullseye
 SharedTags: 3.8-7.3.8, 3.8-7.3, 3.8-7, 3.8, 3-7.3.8, 3-7.3, 3-7, 3, latest
-Architectures: amd64, i386
-GitCommit: fc08343eb14924fc1748b5ad4260ce6ba3ae00ac
+Architectures: amd64, arm64v8, i386
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.8/bullseye
 
 Tags: 3.8-7.3.8-buster, 3.8-7.3-buster, 3.8-7-buster, 3.8-buster, 3-7.3.8-buster, 3-7.3-buster, 3-7-buster, 3-buster, buster
-Architectures: amd64, i386, s390x
-GitCommit: fc08343eb14924fc1748b5ad4260ce6ba3ae00ac
+Architectures: amd64, arm64v8, i386, s390x
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.8/buster
 
 Tags: 3.8-7.3.8-slim, 3.8-7.3-slim, 3.8-7-slim, 3.8-slim, 3-7.3.8-slim, 3-7.3-slim, 3-7-slim, 3-slim, slim, 3.8-7.3.8-slim-bullseye, 3.8-7.3-slim-bullseye, 3.8-7-slim-bullseye, 3.8-slim-bullseye, 3-7.3.8-slim-bullseye, 3-7.3-slim-bullseye, 3-7-slim-bullseye, 3-slim-bullseye, slim-bullseye
-Architectures: amd64, i386
-GitCommit: fc08343eb14924fc1748b5ad4260ce6ba3ae00ac
+Architectures: amd64, arm64v8, i386
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.8/slim-bullseye
 
 Tags: 3.8-7.3.8-slim-buster, 3.8-7.3-slim-buster, 3.8-7-slim-buster, 3.8-slim-buster, 3-7.3.8-slim-buster, 3-7.3-slim-buster, 3-7-slim-buster, 3-slim-buster, slim-buster
-Architectures: amd64, i386, s390x
-GitCommit: fc08343eb14924fc1748b5ad4260ce6ba3ae00ac
+Architectures: amd64, arm64v8, i386, s390x
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.8/slim-buster
 
 Tags: 3.8-7.3.8-windowsservercore-1809, 3.8-7.3-windowsservercore-1809, 3.8-7-windowsservercore-1809, 3.8-windowsservercore-1809, 3-7.3.8-windowsservercore-1809, 3-7.3-windowsservercore-1809, 3-7-windowsservercore-1809, 3-windowsservercore-1809, windowsservercore-1809
 SharedTags: 3.8-7.3.8, 3.8-7.3, 3.8-7, 3.8, 3-7.3.8, 3-7.3, 3-7, 3, latest, 3.8-7.3.8-windowsservercore, 3.8-7.3-windowsservercore, 3.8-7-windowsservercore, 3.8-windowsservercore, 3-7.3.8-windowsservercore, 3-7.3-windowsservercore, 3-7-windowsservercore, 3-windowsservercore, windowsservercore
 Architectures: windows-amd64
-GitCommit: d26c7d6cf69b72d94ead67cae9fed40fd989129a
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.8/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
 Tags: 3.9-7.3.8-bullseye, 3.9-7.3-bullseye, 3.9-7-bullseye, 3.9-bullseye
 SharedTags: 3.9-7.3.8, 3.9-7.3, 3.9-7, 3.9
-Architectures: amd64, i386
-GitCommit: fc08343eb14924fc1748b5ad4260ce6ba3ae00ac
+Architectures: amd64, arm64v8, i386
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.9/bullseye
 
 Tags: 3.9-7.3.8-buster, 3.9-7.3-buster, 3.9-7-buster, 3.9-buster
-Architectures: amd64, i386, s390x
-GitCommit: fc08343eb14924fc1748b5ad4260ce6ba3ae00ac
+Architectures: amd64, arm64v8, i386, s390x
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.9/buster
 
 Tags: 3.9-7.3.8-slim, 3.9-7.3-slim, 3.9-7-slim, 3.9-slim, 3.9-7.3.8-slim-bullseye, 3.9-7.3-slim-bullseye, 3.9-7-slim-bullseye, 3.9-slim-bullseye
-Architectures: amd64, i386
-GitCommit: fc08343eb14924fc1748b5ad4260ce6ba3ae00ac
+Architectures: amd64, arm64v8, i386
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.9/slim-bullseye
 
 Tags: 3.9-7.3.8-slim-buster, 3.9-7.3-slim-buster, 3.9-7-slim-buster, 3.9-slim-buster
-Architectures: amd64, i386, s390x
-GitCommit: fc08343eb14924fc1748b5ad4260ce6ba3ae00ac
+Architectures: amd64, arm64v8, i386, s390x
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.9/slim-buster
 
 Tags: 3.9-7.3.8-windowsservercore-1809, 3.9-7.3-windowsservercore-1809, 3.9-7-windowsservercore-1809, 3.9-windowsservercore-1809
 SharedTags: 3.9-7.3.8, 3.9-7.3, 3.9-7, 3.9, 3.9-7.3.8-windowsservercore, 3.9-7.3-windowsservercore, 3.9-7-windowsservercore, 3.9-windowsservercore
 Architectures: windows-amd64
-GitCommit: fdb8ed8f0e8a7efbc8997841914264f126683f0e
+GitCommit: 70b03f0a3fcbe12c8cdc83024cbc5e02dd867871
 Directory: 3.9/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
diff --git a/pypy_2-bullseye/Dockerfile b/pypy_2-bullseye/Dockerfile
index b04f864..c8add60 100644
--- a/pypy_2-bullseye/Dockerfile
+++ b/pypy_2-bullseye/Dockerfile
@@ -22,6 +22,7 @@ ENV LANG C.UTF-8
 # ensure local pypy is preferred over distribution pypy
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 2.7.18
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -33,13 +34,17 @@ RUN set -eux; \
 			sha256='1f2e84fb539ffce233c34769d2f11647955f894be091e85419e05f48011e8940'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-aarch64.tar.bz2'; \
-			sha256='ca1f8d3146c83002ee97615906b0930e821297dcce3063b5b28933a0690ef298'; \
+			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='b5edfc995d83feea8b4c8aeffccb89753b4b182f076126550bd07cc35faa6208'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-linux32.tar.bz2'; \
 			sha256='7c84f173bbcd73d0eb10909259d11b5cc253d4c6ea4492e6da8f2532df9b3da5'; \
 			;; \
+		's390x') \
+			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-s390x.tar.bz2'; \
+			sha256='b4ae4e708ba84602d976ad6ae391ef2eef4b1896d831b8f2b2ec69927dd92014'; \
+			;; \
 		*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release"; exit 1 ;; \
 	esac; \
 	\
diff --git a/pypy_2-buster/Dockerfile b/pypy_2-buster/Dockerfile
index 9f89f3f..91cd418 100644
--- a/pypy_2-buster/Dockerfile
+++ b/pypy_2-buster/Dockerfile
@@ -22,6 +22,7 @@ ENV LANG C.UTF-8
 # ensure local pypy is preferred over distribution pypy
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 2.7.18
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -33,13 +34,17 @@ RUN set -eux; \
 			sha256='1f2e84fb539ffce233c34769d2f11647955f894be091e85419e05f48011e8940'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-aarch64.tar.bz2'; \
-			sha256='ca1f8d3146c83002ee97615906b0930e821297dcce3063b5b28933a0690ef298'; \
+			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='b5edfc995d83feea8b4c8aeffccb89753b4b182f076126550bd07cc35faa6208'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-linux32.tar.bz2'; \
 			sha256='7c84f173bbcd73d0eb10909259d11b5cc253d4c6ea4492e6da8f2532df9b3da5'; \
 			;; \
+		's390x') \
+			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-s390x.tar.bz2'; \
+			sha256='b4ae4e708ba84602d976ad6ae391ef2eef4b1896d831b8f2b2ec69927dd92014'; \
+			;; \
 		*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release"; exit 1 ;; \
 	esac; \
 	\
diff --git a/pypy_2-slim-bullseye/Dockerfile b/pypy_2-slim-bullseye/Dockerfile
index 0f19649..73c9993 100644
--- a/pypy_2-slim-bullseye/Dockerfile
+++ b/pypy_2-slim-bullseye/Dockerfile
@@ -18,6 +18,7 @@ ENV LANG C.UTF-8
 # ensure local pypy is preferred over distribution pypy
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 2.7.18
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -29,13 +30,17 @@ RUN set -eux; \
 			sha256='1f2e84fb539ffce233c34769d2f11647955f894be091e85419e05f48011e8940'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-aarch64.tar.bz2'; \
-			sha256='ca1f8d3146c83002ee97615906b0930e821297dcce3063b5b28933a0690ef298'; \
+			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='b5edfc995d83feea8b4c8aeffccb89753b4b182f076126550bd07cc35faa6208'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-linux32.tar.bz2'; \
 			sha256='7c84f173bbcd73d0eb10909259d11b5cc253d4c6ea4492e6da8f2532df9b3da5'; \
 			;; \
+		's390x') \
+			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-s390x.tar.bz2'; \
+			sha256='b4ae4e708ba84602d976ad6ae391ef2eef4b1896d831b8f2b2ec69927dd92014'; \
+			;; \
 		*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release"; exit 1 ;; \
 	esac; \
 	\
diff --git a/pypy_2-slim-buster/Dockerfile b/pypy_2-slim-buster/Dockerfile
index 0caaa2d..fcb12f4 100644
--- a/pypy_2-slim-buster/Dockerfile
+++ b/pypy_2-slim-buster/Dockerfile
@@ -18,6 +18,7 @@ ENV LANG C.UTF-8
 # ensure local pypy is preferred over distribution pypy
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 2.7.18
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -29,13 +30,17 @@ RUN set -eux; \
 			sha256='1f2e84fb539ffce233c34769d2f11647955f894be091e85419e05f48011e8940'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-aarch64.tar.bz2'; \
-			sha256='ca1f8d3146c83002ee97615906b0930e821297dcce3063b5b28933a0690ef298'; \
+			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='b5edfc995d83feea8b4c8aeffccb89753b4b182f076126550bd07cc35faa6208'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-linux32.tar.bz2'; \
 			sha256='7c84f173bbcd73d0eb10909259d11b5cc253d4c6ea4492e6da8f2532df9b3da5'; \
 			;; \
+		's390x') \
+			url='https://downloads.python.org/pypy/pypy2.7-v7.3.8-s390x.tar.bz2'; \
+			sha256='b4ae4e708ba84602d976ad6ae391ef2eef4b1896d831b8f2b2ec69927dd92014'; \
+			;; \
 		*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release"; exit 1 ;; \
 	esac; \
 	\
diff --git a/pypy_2-windowsservercore-1809/Dockerfile b/pypy_2-windowsservercore-1809/Dockerfile
index 3c27c83..f2af8c8 100644
--- a/pypy_2-windowsservercore-1809/Dockerfile
+++ b/pypy_2-windowsservercore-1809/Dockerfile
@@ -47,6 +47,7 @@ RUN $url = 'https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81C
 	\
 	Write-Host 'Complete.'
 
+# Python 2.7.18
 ENV PYPY_VERSION 7.3.8
 
 RUN $url = 'https://downloads.python.org/pypy/pypy2.7-v7.3.8-win64.zip'; \
diff --git a/pypy_3.7-bullseye/Dockerfile b/pypy_3.7-bullseye/Dockerfile
index 8cbe63f..ccefd24 100644
--- a/pypy_3.7-bullseye/Dockerfile
+++ b/pypy_3.7-bullseye/Dockerfile
@@ -22,6 +22,7 @@ ENV LANG C.UTF-8
 # ensure local pypy3 is preferred over distribution pypy3
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 3.7.12
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -33,8 +34,8 @@ RUN set -eux; \
 			sha256='409085db79a6d90bfcf4f576dca1538498e65937acfbe03bd4909bdc262ff378'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.7-v7.3.8-aarch64.tar.bz2'; \
-			sha256='4fb2f8281f3aaca72e6fe62ecc5fc054fcc79cd061ca3e0eea730f7d82d610d4'; \
+			url='https://downloads.python.org/pypy/pypy3.7-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='639c76f128a856747aee23a34276fa101a7a157ea81e76394fbaf80b97dcf2f2'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy3.7-v7.3.8-linux32.tar.bz2'; \
diff --git a/pypy_3.7-buster/Dockerfile b/pypy_3.7-buster/Dockerfile
index 8e737e9..2b735d8 100644
--- a/pypy_3.7-buster/Dockerfile
+++ b/pypy_3.7-buster/Dockerfile
@@ -22,6 +22,7 @@ ENV LANG C.UTF-8
 # ensure local pypy3 is preferred over distribution pypy3
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 3.7.12
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -33,8 +34,8 @@ RUN set -eux; \
 			sha256='409085db79a6d90bfcf4f576dca1538498e65937acfbe03bd4909bdc262ff378'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.7-v7.3.8-aarch64.tar.bz2'; \
-			sha256='4fb2f8281f3aaca72e6fe62ecc5fc054fcc79cd061ca3e0eea730f7d82d610d4'; \
+			url='https://downloads.python.org/pypy/pypy3.7-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='639c76f128a856747aee23a34276fa101a7a157ea81e76394fbaf80b97dcf2f2'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy3.7-v7.3.8-linux32.tar.bz2'; \
diff --git a/pypy_3.7-slim-bullseye/Dockerfile b/pypy_3.7-slim-bullseye/Dockerfile
index 41287f1..042c1f0 100644
--- a/pypy_3.7-slim-bullseye/Dockerfile
+++ b/pypy_3.7-slim-bullseye/Dockerfile
@@ -18,6 +18,7 @@ ENV LANG C.UTF-8
 # ensure local pypy3 is preferred over distribution pypy3
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 3.7.12
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -29,8 +30,8 @@ RUN set -eux; \
 			sha256='409085db79a6d90bfcf4f576dca1538498e65937acfbe03bd4909bdc262ff378'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.7-v7.3.8-aarch64.tar.bz2'; \
-			sha256='4fb2f8281f3aaca72e6fe62ecc5fc054fcc79cd061ca3e0eea730f7d82d610d4'; \
+			url='https://downloads.python.org/pypy/pypy3.7-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='639c76f128a856747aee23a34276fa101a7a157ea81e76394fbaf80b97dcf2f2'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy3.7-v7.3.8-linux32.tar.bz2'; \
diff --git a/pypy_3.7-slim-buster/Dockerfile b/pypy_3.7-slim-buster/Dockerfile
index d80ece9..4ccb8fb 100644
--- a/pypy_3.7-slim-buster/Dockerfile
+++ b/pypy_3.7-slim-buster/Dockerfile
@@ -18,6 +18,7 @@ ENV LANG C.UTF-8
 # ensure local pypy3 is preferred over distribution pypy3
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 3.7.12
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -29,8 +30,8 @@ RUN set -eux; \
 			sha256='409085db79a6d90bfcf4f576dca1538498e65937acfbe03bd4909bdc262ff378'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.7-v7.3.8-aarch64.tar.bz2'; \
-			sha256='4fb2f8281f3aaca72e6fe62ecc5fc054fcc79cd061ca3e0eea730f7d82d610d4'; \
+			url='https://downloads.python.org/pypy/pypy3.7-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='639c76f128a856747aee23a34276fa101a7a157ea81e76394fbaf80b97dcf2f2'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy3.7-v7.3.8-linux32.tar.bz2'; \
diff --git a/pypy_3.7-windowsservercore-1809/Dockerfile b/pypy_3.7-windowsservercore-1809/Dockerfile
index 5dd55e0..dda76ad 100644
--- a/pypy_3.7-windowsservercore-1809/Dockerfile
+++ b/pypy_3.7-windowsservercore-1809/Dockerfile
@@ -44,6 +44,7 @@ RUN $url = 'https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81C
 	\
 	Write-Host 'Complete.'
 
+# Python 3.7.12
 ENV PYPY_VERSION 7.3.8
 
 RUN $url = 'https://downloads.python.org/pypy/pypy3.7-v7.3.8-win64.zip'; \
diff --git a/pypy_3.9-bullseye/Dockerfile b/pypy_3.9-bullseye/Dockerfile
index f283207..45eb550 100644
--- a/pypy_3.9-bullseye/Dockerfile
+++ b/pypy_3.9-bullseye/Dockerfile
@@ -22,6 +22,7 @@ ENV LANG C.UTF-8
 # ensure local pypy3 is preferred over distribution pypy3
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 3.9.10
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -33,8 +34,8 @@ RUN set -eux; \
 			sha256='129a055032bba700cd1d0acacab3659cf6b7180e25b1b2f730e792f06d5b3010'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.8-aarch64.tar.bz2'; \
-			sha256='89d7ee12a8c416e83fae80af82482531fc6502321e75e5b7a0cc01d756ee5f0e'; \
+			url='https://downloads.python.org/pypy/pypy3.9-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='b7282bc4484bceae5bc4cc04e05ee4faf51cb624c8fc7a69d92e5fdf0d0c96aa'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy3.9-v7.3.8-linux32.tar.bz2'; \
diff --git a/pypy_3.9-buster/Dockerfile b/pypy_3.9-buster/Dockerfile
index 8520644..35355fd 100644
--- a/pypy_3.9-buster/Dockerfile
+++ b/pypy_3.9-buster/Dockerfile
@@ -22,6 +22,7 @@ ENV LANG C.UTF-8
 # ensure local pypy3 is preferred over distribution pypy3
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 3.9.10
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -33,8 +34,8 @@ RUN set -eux; \
 			sha256='129a055032bba700cd1d0acacab3659cf6b7180e25b1b2f730e792f06d5b3010'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.8-aarch64.tar.bz2'; \
-			sha256='89d7ee12a8c416e83fae80af82482531fc6502321e75e5b7a0cc01d756ee5f0e'; \
+			url='https://downloads.python.org/pypy/pypy3.9-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='b7282bc4484bceae5bc4cc04e05ee4faf51cb624c8fc7a69d92e5fdf0d0c96aa'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy3.9-v7.3.8-linux32.tar.bz2'; \
diff --git a/pypy_3.9-slim-bullseye/Dockerfile b/pypy_3.9-slim-bullseye/Dockerfile
index b3de69a..a2c5418 100644
--- a/pypy_3.9-slim-bullseye/Dockerfile
+++ b/pypy_3.9-slim-bullseye/Dockerfile
@@ -18,6 +18,7 @@ ENV LANG C.UTF-8
 # ensure local pypy3 is preferred over distribution pypy3
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 3.9.10
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -29,8 +30,8 @@ RUN set -eux; \
 			sha256='129a055032bba700cd1d0acacab3659cf6b7180e25b1b2f730e792f06d5b3010'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.8-aarch64.tar.bz2'; \
-			sha256='89d7ee12a8c416e83fae80af82482531fc6502321e75e5b7a0cc01d756ee5f0e'; \
+			url='https://downloads.python.org/pypy/pypy3.9-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='b7282bc4484bceae5bc4cc04e05ee4faf51cb624c8fc7a69d92e5fdf0d0c96aa'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy3.9-v7.3.8-linux32.tar.bz2'; \
diff --git a/pypy_3.9-slim-buster/Dockerfile b/pypy_3.9-slim-buster/Dockerfile
index 0d2045e..75b03fa 100644
--- a/pypy_3.9-slim-buster/Dockerfile
+++ b/pypy_3.9-slim-buster/Dockerfile
@@ -18,6 +18,7 @@ ENV LANG C.UTF-8
 # ensure local pypy3 is preferred over distribution pypy3
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 3.9.10
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -29,8 +30,8 @@ RUN set -eux; \
 			sha256='129a055032bba700cd1d0acacab3659cf6b7180e25b1b2f730e792f06d5b3010'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.9-v7.3.8-aarch64.tar.bz2'; \
-			sha256='89d7ee12a8c416e83fae80af82482531fc6502321e75e5b7a0cc01d756ee5f0e'; \
+			url='https://downloads.python.org/pypy/pypy3.9-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='b7282bc4484bceae5bc4cc04e05ee4faf51cb624c8fc7a69d92e5fdf0d0c96aa'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy3.9-v7.3.8-linux32.tar.bz2'; \
diff --git a/pypy_3.9-windowsservercore-1809/Dockerfile b/pypy_3.9-windowsservercore-1809/Dockerfile
index 0053d8f..a8e59fe 100644
--- a/pypy_3.9-windowsservercore-1809/Dockerfile
+++ b/pypy_3.9-windowsservercore-1809/Dockerfile
@@ -44,6 +44,7 @@ RUN $url = 'https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81C
 	\
 	Write-Host 'Complete.'
 
+# Python 3.9.10
 ENV PYPY_VERSION 7.3.8
 
 RUN $url = 'https://downloads.python.org/pypy/pypy3.9-v7.3.8-win64.zip'; \
diff --git a/pypy_bullseye/Dockerfile b/pypy_bullseye/Dockerfile
index 9256688..bd0dddb 100644
--- a/pypy_bullseye/Dockerfile
+++ b/pypy_bullseye/Dockerfile
@@ -22,6 +22,7 @@ ENV LANG C.UTF-8
 # ensure local pypy3 is preferred over distribution pypy3
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 3.8.12
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -33,8 +34,8 @@ RUN set -eux; \
 			sha256='089f8e3e357d6130815964ddd3507c13bd53e4976ccf0a89b5c36a9a6775a188'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.8-v7.3.8-aarch64.tar.bz2'; \
-			sha256='fe41df391f87239925e573e195e631a9d03d37f471eb1479790ee13ca47a28af'; \
+			url='https://downloads.python.org/pypy/pypy3.8-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='0210536e9f1841ba283c13b04783394050837bb3e6f4091c9f1bd9c7f2b94b55'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy3.8-v7.3.8-linux32.tar.bz2'; \
diff --git a/pypy_buster/Dockerfile b/pypy_buster/Dockerfile
index ec614aa..4019ef4 100644
--- a/pypy_buster/Dockerfile
+++ b/pypy_buster/Dockerfile
@@ -22,6 +22,7 @@ ENV LANG C.UTF-8
 # ensure local pypy3 is preferred over distribution pypy3
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 3.8.12
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -33,8 +34,8 @@ RUN set -eux; \
 			sha256='089f8e3e357d6130815964ddd3507c13bd53e4976ccf0a89b5c36a9a6775a188'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.8-v7.3.8-aarch64.tar.bz2'; \
-			sha256='fe41df391f87239925e573e195e631a9d03d37f471eb1479790ee13ca47a28af'; \
+			url='https://downloads.python.org/pypy/pypy3.8-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='0210536e9f1841ba283c13b04783394050837bb3e6f4091c9f1bd9c7f2b94b55'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy3.8-v7.3.8-linux32.tar.bz2'; \
diff --git a/pypy_slim-bullseye/Dockerfile b/pypy_slim-bullseye/Dockerfile
index 8461841..b19947d 100644
--- a/pypy_slim-bullseye/Dockerfile
+++ b/pypy_slim-bullseye/Dockerfile
@@ -18,6 +18,7 @@ ENV LANG C.UTF-8
 # ensure local pypy3 is preferred over distribution pypy3
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 3.8.12
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -29,8 +30,8 @@ RUN set -eux; \
 			sha256='089f8e3e357d6130815964ddd3507c13bd53e4976ccf0a89b5c36a9a6775a188'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.8-v7.3.8-aarch64.tar.bz2'; \
-			sha256='fe41df391f87239925e573e195e631a9d03d37f471eb1479790ee13ca47a28af'; \
+			url='https://downloads.python.org/pypy/pypy3.8-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='0210536e9f1841ba283c13b04783394050837bb3e6f4091c9f1bd9c7f2b94b55'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy3.8-v7.3.8-linux32.tar.bz2'; \
diff --git a/pypy_slim-buster/Dockerfile b/pypy_slim-buster/Dockerfile
index edbe799..c2941a5 100644
--- a/pypy_slim-buster/Dockerfile
+++ b/pypy_slim-buster/Dockerfile
@@ -18,6 +18,7 @@ ENV LANG C.UTF-8
 # ensure local pypy3 is preferred over distribution pypy3
 ENV PATH /opt/pypy/bin:$PATH
 
+# Python 3.8.12
 ENV PYPY_VERSION 7.3.8
 
 RUN set -eux; \
@@ -29,8 +30,8 @@ RUN set -eux; \
 			sha256='089f8e3e357d6130815964ddd3507c13bd53e4976ccf0a89b5c36a9a6775a188'; \
 			;; \
 		'arm64') \
-			url='https://downloads.python.org/pypy/pypy3.8-v7.3.8-aarch64.tar.bz2'; \
-			sha256='fe41df391f87239925e573e195e631a9d03d37f471eb1479790ee13ca47a28af'; \
+			url='https://downloads.python.org/pypy/pypy3.8-v7.3.8-aarch64-portable.tar.bz2'; \
+			sha256='0210536e9f1841ba283c13b04783394050837bb3e6f4091c9f1bd9c7f2b94b55'; \
 			;; \
 		'i386') \
 			url='https://downloads.python.org/pypy/pypy3.8-v7.3.8-linux32.tar.bz2'; \
diff --git a/pypy_windowsservercore-1809/Dockerfile b/pypy_windowsservercore-1809/Dockerfile
index 532830c..b7ec372 100644
--- a/pypy_windowsservercore-1809/Dockerfile
+++ b/pypy_windowsservercore-1809/Dockerfile
@@ -44,6 +44,7 @@ RUN $url = 'https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81C
 	\
 	Write-Host 'Complete.'
 
+# Python 3.8.12
 ENV PYPY_VERSION 7.3.8
 
 RUN $url = 'https://downloads.python.org/pypy/pypy3.8-v7.3.8-win64.zip'; \

Relevant Maintainers:

@tianon tianon merged commit 6c321ba into docker-library:master Mar 8, 2022
@tianon tianon deleted the pypy branch March 8, 2022 01:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants