Update pypy #11789
Merged
Update pypy #11789
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/pypy@6b9be45: Merge pull request docker-library/pypy#66 from bartbroere/patch-1 - docker-library/pypy@f2b3767: Move the tags for '3' and 'latest' - docker-library/pypy@73f1577: Remove reference to ltsc2016 variants (EOL)
Diff for 41319e4:diff --git a/_bashbrew-cat b/_bashbrew-cat
index b7e7735..4393aa9 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -29,57 +29,57 @@ GitCommit: 3e9d1aa19f3be86f46337cb0e86721395b7166f4
Directory: 2.7/windows/windowsservercore-1809
Constraints: windowsservercore-1809
-Tags: 3.7-7.3.7-bullseye, 3.7-7.3-bullseye, 3.7-7-bullseye, 3.7-bullseye, 3-7.3.7-bullseye, 3-7.3-bullseye, 3-7-bullseye, 3-bullseye, bullseye
-SharedTags: 3.7-7.3.7, 3.7-7.3, 3.7-7, 3.7, 3-7.3.7, 3-7.3, 3-7, 3, latest
+Tags: 3.7-7.3.7-bullseye, 3.7-7.3-bullseye, 3.7-7-bullseye, 3.7-bullseye
+SharedTags: 3.7-7.3.7, 3.7-7.3, 3.7-7, 3.7
Architectures: amd64, arm64v8, i386
GitCommit: c691d58e3c28b17bfccadd5040a5ff3b57ef19b0
Directory: 3.7/bullseye
-Tags: 3.7-7.3.7-buster, 3.7-7.3-buster, 3.7-7-buster, 3.7-buster, 3-7.3.7-buster, 3-7.3-buster, 3-7-buster, 3-buster, buster
+Tags: 3.7-7.3.7-buster, 3.7-7.3-buster, 3.7-7-buster, 3.7-buster
Architectures: amd64, arm64v8, i386, s390x
GitCommit: c691d58e3c28b17bfccadd5040a5ff3b57ef19b0
Directory: 3.7/buster
-Tags: 3.7-7.3.7-slim, 3.7-7.3-slim, 3.7-7-slim, 3.7-slim, 3-7.3.7-slim, 3-7.3-slim, 3-7-slim, 3-slim, slim, 3.7-7.3.7-slim-bullseye, 3.7-7.3-slim-bullseye, 3.7-7-slim-bullseye, 3.7-slim-bullseye, 3-7.3.7-slim-bullseye, 3-7.3-slim-bullseye, 3-7-slim-bullseye, 3-slim-bullseye, slim-bullseye
+Tags: 3.7-7.3.7-slim, 3.7-7.3-slim, 3.7-7-slim, 3.7-slim, 3.7-7.3.7-slim-bullseye, 3.7-7.3-slim-bullseye, 3.7-7-slim-bullseye, 3.7-slim-bullseye
Architectures: amd64, arm64v8, i386
GitCommit: c691d58e3c28b17bfccadd5040a5ff3b57ef19b0
Directory: 3.7/slim-bullseye
-Tags: 3.7-7.3.7-slim-buster, 3.7-7.3-slim-buster, 3.7-7-slim-buster, 3.7-slim-buster, 3-7.3.7-slim-buster, 3-7.3-slim-buster, 3-7-slim-buster, 3-slim-buster, slim-buster
+Tags: 3.7-7.3.7-slim-buster, 3.7-7.3-slim-buster, 3.7-7-slim-buster, 3.7-slim-buster
Architectures: amd64, arm64v8, i386, s390x
GitCommit: c691d58e3c28b17bfccadd5040a5ff3b57ef19b0
Directory: 3.7/slim-buster
-Tags: 3.7-7.3.7-windowsservercore-1809, 3.7-7.3-windowsservercore-1809, 3.7-7-windowsservercore-1809, 3.7-windowsservercore-1809, 3-7.3.7-windowsservercore-1809, 3-7.3-windowsservercore-1809, 3-7-windowsservercore-1809, 3-windowsservercore-1809, windowsservercore-1809
-SharedTags: 3.7-7.3.7, 3.7-7.3, 3.7-7, 3.7, 3-7.3.7, 3-7.3, 3-7, 3, latest, 3.7-7.3.7-windowsservercore, 3.7-7.3-windowsservercore, 3.7-7-windowsservercore, 3.7-windowsservercore, 3-7.3.7-windowsservercore, 3-7.3-windowsservercore, 3-7-windowsservercore, 3-windowsservercore, windowsservercore
+Tags: 3.7-7.3.7-windowsservercore-1809, 3.7-7.3-windowsservercore-1809, 3.7-7-windowsservercore-1809, 3.7-windowsservercore-1809
+SharedTags: 3.7-7.3.7, 3.7-7.3, 3.7-7, 3.7, 3.7-7.3.7-windowsservercore, 3.7-7.3-windowsservercore, 3.7-7-windowsservercore, 3.7-windowsservercore
Architectures: windows-amd64
GitCommit: 866a266ef231ca7c9efd2accc1fba1c55ad79b85
Directory: 3.7/windows/windowsservercore-1809
Constraints: windowsservercore-1809
-Tags: 3.8-7.3.7-bullseye, 3.8-7.3-bullseye, 3.8-7-bullseye, 3.8-bullseye
-SharedTags: 3.8-7.3.7, 3.8-7.3, 3.8-7, 3.8
+Tags: 3.8-7.3.7-bullseye, 3.8-7.3-bullseye, 3.8-7-bullseye, 3.8-bullseye, 3-7.3.7-bullseye, 3-7.3-bullseye, 3-7-bullseye, 3-bullseye, bullseye
+SharedTags: 3.8-7.3.7, 3.8-7.3, 3.8-7, 3.8, 3-7.3.7, 3-7.3, 3-7, 3, latest
Architectures: amd64, arm64v8, i386
GitCommit: c691d58e3c28b17bfccadd5040a5ff3b57ef19b0
Directory: 3.8/bullseye
-Tags: 3.8-7.3.7-buster, 3.8-7.3-buster, 3.8-7-buster, 3.8-buster
+Tags: 3.8-7.3.7-buster, 3.8-7.3-buster, 3.8-7-buster, 3.8-buster, 3-7.3.7-buster, 3-7.3-buster, 3-7-buster, 3-buster, buster
Architectures: amd64, arm64v8, i386, s390x
GitCommit: c691d58e3c28b17bfccadd5040a5ff3b57ef19b0
Directory: 3.8/buster
-Tags: 3.8-7.3.7-slim, 3.8-7.3-slim, 3.8-7-slim, 3.8-slim, 3.8-7.3.7-slim-bullseye, 3.8-7.3-slim-bullseye, 3.8-7-slim-bullseye, 3.8-slim-bullseye
+Tags: 3.8-7.3.7-slim, 3.8-7.3-slim, 3.8-7-slim, 3.8-slim, 3-7.3.7-slim, 3-7.3-slim, 3-7-slim, 3-slim, slim, 3.8-7.3.7-slim-bullseye, 3.8-7.3-slim-bullseye, 3.8-7-slim-bullseye, 3.8-slim-bullseye, 3-7.3.7-slim-bullseye, 3-7.3-slim-bullseye, 3-7-slim-bullseye, 3-slim-bullseye, slim-bullseye
Architectures: amd64, arm64v8, i386
GitCommit: c691d58e3c28b17bfccadd5040a5ff3b57ef19b0
Directory: 3.8/slim-bullseye
-Tags: 3.8-7.3.7-slim-buster, 3.8-7.3-slim-buster, 3.8-7-slim-buster, 3.8-slim-buster
+Tags: 3.8-7.3.7-slim-buster, 3.8-7.3-slim-buster, 3.8-7-slim-buster, 3.8-slim-buster, 3-7.3.7-slim-buster, 3-7.3-slim-buster, 3-7-slim-buster, 3-slim-buster, slim-buster
Architectures: amd64, arm64v8, i386, s390x
GitCommit: c691d58e3c28b17bfccadd5040a5ff3b57ef19b0
Directory: 3.8/slim-buster
-Tags: 3.8-7.3.7-windowsservercore-1809, 3.8-7.3-windowsservercore-1809, 3.8-7-windowsservercore-1809, 3.8-windowsservercore-1809
-SharedTags: 3.8-7.3.7, 3.8-7.3, 3.8-7, 3.8, 3.8-7.3.7-windowsservercore, 3.8-7.3-windowsservercore, 3.8-7-windowsservercore, 3.8-windowsservercore
+Tags: 3.8-7.3.7-windowsservercore-1809, 3.8-7.3-windowsservercore-1809, 3.8-7-windowsservercore-1809, 3.8-windowsservercore-1809, 3-7.3.7-windowsservercore-1809, 3-7.3-windowsservercore-1809, 3-7-windowsservercore-1809, 3-windowsservercore-1809, windowsservercore-1809
+SharedTags: 3.8-7.3.7, 3.8-7.3, 3.8-7, 3.8, 3-7.3.7, 3-7.3, 3-7, 3, latest, 3.8-7.3.7-windowsservercore, 3.8-7.3-windowsservercore, 3.8-7-windowsservercore, 3.8-windowsservercore, 3-7.3.7-windowsservercore, 3-7.3-windowsservercore, 3-7-windowsservercore, 3-windowsservercore, windowsservercore
Architectures: windows-amd64
GitCommit: c691d58e3c28b17bfccadd5040a5ff3b57ef19b0
Directory: 3.8/windows/windowsservercore-1809
diff --git a/pypy_bullseye/Dockerfile b/pypy_3.7-bullseye/Dockerfile
similarity index 100%
copy from pypy_bullseye/Dockerfile
copy to pypy_3.7-bullseye/Dockerfile
diff --git a/pypy_buster/Dockerfile b/pypy_3.7-buster/Dockerfile
similarity index 100%
copy from pypy_buster/Dockerfile
copy to pypy_3.7-buster/Dockerfile
diff --git a/pypy_slim-bullseye/Dockerfile b/pypy_3.7-slim-bullseye/Dockerfile
similarity index 100%
copy from pypy_slim-bullseye/Dockerfile
copy to pypy_3.7-slim-bullseye/Dockerfile
diff --git a/pypy_slim-buster/Dockerfile b/pypy_3.7-slim-buster/Dockerfile
similarity index 100%
copy from pypy_slim-buster/Dockerfile
copy to pypy_3.7-slim-buster/Dockerfile
diff --git a/pypy_windowsservercore-1809/Dockerfile b/pypy_3.7-windowsservercore-1809/Dockerfile
similarity index 100%
copy from pypy_windowsservercore-1809/Dockerfile
copy to pypy_3.7-windowsservercore-1809/Dockerfile
diff --git a/pypy_3.8-bullseye/Dockerfile b/pypy_3.8-bullseye/Dockerfile
deleted file mode 100644
index 71e41d5..0000000
diff --git a/pypy_3.8-buster/Dockerfile b/pypy_3.8-buster/Dockerfile
deleted file mode 100644
index 57c89f4..0000000
diff --git a/pypy_3.8-slim-bullseye/Dockerfile b/pypy_3.8-slim-bullseye/Dockerfile
deleted file mode 100644
index 204da8c..0000000
diff --git a/pypy_3.8-slim-buster/Dockerfile b/pypy_3.8-slim-buster/Dockerfile
deleted file mode 100644
index 868c94d..0000000
diff --git a/pypy_3.8-windowsservercore-1809/Dockerfile b/pypy_3.8-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 767db22..0000000
diff --git a/pypy_bullseye/Dockerfile b/pypy_bullseye/Dockerfile
index 1520909..71e41d5 100644
--- a/pypy_bullseye/Dockerfile
+++ b/pypy_bullseye/Dockerfile
@@ -29,20 +29,20 @@ RUN set -eux; \
dpkgArch="$(dpkg --print-architecture)"; \
case "${dpkgArch##*-}" in \
'amd64') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-linux64.tar.bz2'; \
- sha256='8332f923755441fedfe4767a84601c94f4d6f8475384406cb5f259ad8d0b2002'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-linux64.tar.bz2'; \
+ sha256='5dee37c7c3cb8b160028fbde3a5901c68043dfa545a16794502b897d4bc40d7e'; \
;; \
'arm64') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-aarch64.tar.bz2'; \
- sha256='a1a84882525dd574c4b051b66e9b7ef0e132392acc2f729420d7825f96835216'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-aarch64.tar.bz2'; \
+ sha256='cbd44e0a9146b3c03a9d14b265774a848f387ed846316c3e984847e278d0efd3'; \
;; \
'i386') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-linux32.tar.bz2'; \
- sha256='0ab9e2e8ae1ac463bb811b9d3ba24d138f41f7378c17ca9e2d8dee51bf151d19'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-linux32.tar.bz2'; \
+ sha256='dfb9d005f0fc917edc60fd618143e4934c412f9168b55166f5519ba0a3b1a835'; \
;; \
's390x') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-s390x.tar.bz2'; \
- sha256='7f91efc65a69e727519cc885ca6351f4bfdd6b90580dced2fdcc9ae1bf10013b'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-s390x.tar.bz2'; \
+ sha256='ae7d6a76490b317a74b87788d596610c7ffd0ae2d3ffa2433d5bb5300f6b4b77'; \
;; \
*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release"; exit 1 ;; \
esac; \
@@ -50,7 +50,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends \
-# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib_pypy"
+# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.8"
libexpat1 \
libncurses5 \
libncursesw6 \
@@ -71,7 +71,7 @@ RUN set -eux; \
pypy3 --version; \
\
# on pypy3, rebuild ffi bits for compatibility with Debian Stretch+
- cd /opt/pypy/lib_pypy; \
+ cd /opt/pypy/lib/pypy3.8; \
if [ -f _gdbm_build.py ]; then \
pypy3 _gdbm_build.py; \
fi; \
diff --git a/pypy_buster/Dockerfile b/pypy_buster/Dockerfile
index 5f9a0bd..57c89f4 100644
--- a/pypy_buster/Dockerfile
+++ b/pypy_buster/Dockerfile
@@ -29,20 +29,20 @@ RUN set -eux; \
dpkgArch="$(dpkg --print-architecture)"; \
case "${dpkgArch##*-}" in \
'amd64') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-linux64.tar.bz2'; \
- sha256='8332f923755441fedfe4767a84601c94f4d6f8475384406cb5f259ad8d0b2002'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-linux64.tar.bz2'; \
+ sha256='5dee37c7c3cb8b160028fbde3a5901c68043dfa545a16794502b897d4bc40d7e'; \
;; \
'arm64') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-aarch64.tar.bz2'; \
- sha256='a1a84882525dd574c4b051b66e9b7ef0e132392acc2f729420d7825f96835216'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-aarch64.tar.bz2'; \
+ sha256='cbd44e0a9146b3c03a9d14b265774a848f387ed846316c3e984847e278d0efd3'; \
;; \
'i386') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-linux32.tar.bz2'; \
- sha256='0ab9e2e8ae1ac463bb811b9d3ba24d138f41f7378c17ca9e2d8dee51bf151d19'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-linux32.tar.bz2'; \
+ sha256='dfb9d005f0fc917edc60fd618143e4934c412f9168b55166f5519ba0a3b1a835'; \
;; \
's390x') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-s390x.tar.bz2'; \
- sha256='7f91efc65a69e727519cc885ca6351f4bfdd6b90580dced2fdcc9ae1bf10013b'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-s390x.tar.bz2'; \
+ sha256='ae7d6a76490b317a74b87788d596610c7ffd0ae2d3ffa2433d5bb5300f6b4b77'; \
;; \
*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release"; exit 1 ;; \
esac; \
@@ -50,7 +50,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends \
-# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib_pypy"
+# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.8"
libexpat1 \
libncurses5 \
libncursesw6 \
@@ -71,7 +71,7 @@ RUN set -eux; \
pypy3 --version; \
\
# on pypy3, rebuild ffi bits for compatibility with Debian Stretch+
- cd /opt/pypy/lib_pypy; \
+ cd /opt/pypy/lib/pypy3.8; \
if [ -f _gdbm_build.py ]; then \
pypy3 _gdbm_build.py; \
fi; \
diff --git a/pypy_slim-bullseye/Dockerfile b/pypy_slim-bullseye/Dockerfile
index bbecce8..204da8c 100644
--- a/pypy_slim-bullseye/Dockerfile
+++ b/pypy_slim-bullseye/Dockerfile
@@ -25,20 +25,20 @@ RUN set -eux; \
dpkgArch="$(dpkg --print-architecture)"; \
case "${dpkgArch##*-}" in \
'amd64') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-linux64.tar.bz2'; \
- sha256='8332f923755441fedfe4767a84601c94f4d6f8475384406cb5f259ad8d0b2002'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-linux64.tar.bz2'; \
+ sha256='5dee37c7c3cb8b160028fbde3a5901c68043dfa545a16794502b897d4bc40d7e'; \
;; \
'arm64') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-aarch64.tar.bz2'; \
- sha256='a1a84882525dd574c4b051b66e9b7ef0e132392acc2f729420d7825f96835216'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-aarch64.tar.bz2'; \
+ sha256='cbd44e0a9146b3c03a9d14b265774a848f387ed846316c3e984847e278d0efd3'; \
;; \
'i386') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-linux32.tar.bz2'; \
- sha256='0ab9e2e8ae1ac463bb811b9d3ba24d138f41f7378c17ca9e2d8dee51bf151d19'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-linux32.tar.bz2'; \
+ sha256='dfb9d005f0fc917edc60fd618143e4934c412f9168b55166f5519ba0a3b1a835'; \
;; \
's390x') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-s390x.tar.bz2'; \
- sha256='7f91efc65a69e727519cc885ca6351f4bfdd6b90580dced2fdcc9ae1bf10013b'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-s390x.tar.bz2'; \
+ sha256='ae7d6a76490b317a74b87788d596610c7ffd0ae2d3ffa2433d5bb5300f6b4b77'; \
;; \
*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release"; exit 1 ;; \
esac; \
@@ -48,7 +48,7 @@ RUN set -eux; \
apt-get install -y --no-install-recommends \
bzip2 \
wget \
-# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib_pypy"
+# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.8"
libexpat1 \
libncurses5 \
libncursesw6 \
@@ -69,7 +69,7 @@ RUN set -eux; \
pypy3 --version; \
\
# on pypy3, rebuild ffi bits for compatibility with Debian Stretch+
- cd /opt/pypy/lib_pypy; \
+ cd /opt/pypy/lib/pypy3.8; \
if [ -f _gdbm_build.py ]; then \
apt-get install -y --no-install-recommends gcc libc6-dev libgdbm-dev; \
pypy3 _gdbm_build.py; \
diff --git a/pypy_slim-buster/Dockerfile b/pypy_slim-buster/Dockerfile
index de0ef85..868c94d 100644
--- a/pypy_slim-buster/Dockerfile
+++ b/pypy_slim-buster/Dockerfile
@@ -25,20 +25,20 @@ RUN set -eux; \
dpkgArch="$(dpkg --print-architecture)"; \
case "${dpkgArch##*-}" in \
'amd64') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-linux64.tar.bz2'; \
- sha256='8332f923755441fedfe4767a84601c94f4d6f8475384406cb5f259ad8d0b2002'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-linux64.tar.bz2'; \
+ sha256='5dee37c7c3cb8b160028fbde3a5901c68043dfa545a16794502b897d4bc40d7e'; \
;; \
'arm64') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-aarch64.tar.bz2'; \
- sha256='a1a84882525dd574c4b051b66e9b7ef0e132392acc2f729420d7825f96835216'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-aarch64.tar.bz2'; \
+ sha256='cbd44e0a9146b3c03a9d14b265774a848f387ed846316c3e984847e278d0efd3'; \
;; \
'i386') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-linux32.tar.bz2'; \
- sha256='0ab9e2e8ae1ac463bb811b9d3ba24d138f41f7378c17ca9e2d8dee51bf151d19'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-linux32.tar.bz2'; \
+ sha256='dfb9d005f0fc917edc60fd618143e4934c412f9168b55166f5519ba0a3b1a835'; \
;; \
's390x') \
- url='https://downloads.python.org/pypy/pypy3.7-v7.3.7-s390x.tar.bz2'; \
- sha256='7f91efc65a69e727519cc885ca6351f4bfdd6b90580dced2fdcc9ae1bf10013b'; \
+ url='https://downloads.python.org/pypy/pypy3.8-v7.3.7-s390x.tar.bz2'; \
+ sha256='ae7d6a76490b317a74b87788d596610c7ffd0ae2d3ffa2433d5bb5300f6b4b77'; \
;; \
*) echo >&2 "error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release"; exit 1 ;; \
esac; \
@@ -48,7 +48,7 @@ RUN set -eux; \
apt-get install -y --no-install-recommends \
bzip2 \
wget \
-# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib_pypy"
+# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.8"
libexpat1 \
libncurses5 \
libncursesw6 \
@@ -69,7 +69,7 @@ RUN set -eux; \
pypy3 --version; \
\
# on pypy3, rebuild ffi bits for compatibility with Debian Stretch+
- cd /opt/pypy/lib_pypy; \
+ cd /opt/pypy/lib/pypy3.8; \
if [ -f _gdbm_build.py ]; then \
apt-get install -y --no-install-recommends gcc libc6-dev libgdbm-dev; \
pypy3 _gdbm_build.py; \
diff --git a/pypy_windowsservercore-1809/Dockerfile b/pypy_windowsservercore-1809/Dockerfile
index 99920f2..767db22 100644
--- a/pypy_windowsservercore-1809/Dockerfile
+++ b/pypy_windowsservercore-1809/Dockerfile
@@ -46,11 +46,11 @@ RUN $url = 'https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81C
ENV PYPY_VERSION 7.3.7
-RUN $url = 'https://downloads.python.org/pypy/pypy3.7-v7.3.7-win64.zip'; \
+RUN $url = 'https://downloads.python.org/pypy/pypy3.8-v7.3.7-win64.zip'; \
Write-Host ('Downloading {0} ...' -f $url); \
Invoke-WebRequest -Uri $url -OutFile 'pypy.zip'; \
\
- $sha256 = '53505dc0b57590290efd7656117ee5384bcd036f7f7c4f0bc3f5cd10299037d1'; \
+ $sha256 = '8ceb03d2f7b73c6ce0758290bc42ba366a45c46e033eda36f1779d957a905735'; \
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
if ((Get-FileHash pypy.zip -Algorithm sha256).Hash -ne $sha256) { \
Write-Host 'FAILED!'; \
@@ -64,7 +64,7 @@ RUN $url = 'https://downloads.python.org/pypy/pypy3.7-v7.3.7-win64.zip'; \
Remove-Item pypy.zip -Force; \
\
Write-Host 'Renaming ...'; \
- Rename-Item -Path C:\pypy3.7-v7.3.7-win64 -NewName C:\pypy; \
+ Rename-Item -Path C:\pypy3.8-v7.3.7-win64 -NewName C:\pypy; \
\
Write-Host 'Verifying install ("pypy3 --version") ...'; \
pypy3 --version; \Relevant Maintainers: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: