search

docker-library / pypy

Docker Official Image packaging for pypy
http://pypy.org/
MIT License
69 stars 46 forks source link

Switch to using the upstream-provided "versions.json" file #73

Closed tianon closed 2 years ago

tianon commented 2 years ago

Getting version/URL information from https://downloads.python.org/pypy/versions.json should give us much more accurate and reliable versioning information than scraping HTML does.

This also gets us the correct adjusted URL for the current aarch64 releases that allow us to bring back arm64v8 support! (https://github.com/docker-library/pypy/pull/69#issuecomment-1061057221) :tada:

Thanks @mattip!!

tianon commented 2 years ago
Diff: ```diff $ diff -u <(bashbrew cat pypy) <(bashbrew cat <(./generate-stackbrew-library.sh)) --- /dev/fd/63 2022-03-07 16:02:35.906752097 -0800 +++ /dev/fd/62 2022-03-07 16:02:35.906752097 -0800 @@ -3,112 +3,112 @@ 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-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-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-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 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-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-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-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.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-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-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-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: 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-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-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-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 ```
tianon commented 2 years ago

s390x on Debian Bullseye and above is still a no-go, but I made some minor adjustments here to leave it in the generator such that it's easier to test (and we exclude it on the library/pypy generation already anyhow)