Update pypy #14860
Merged
Update pypy #14860
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@ef726cd: Merge pull request docker-library/pypy#77 from infosiftr/bookworm - docker-library/pypy@9a9efe0: Add Debian bookworm, drop buster
Diff for 20939e0:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9cf66df..c84cf31 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,26 +1,26 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/pypy.git
+Tags: 2.7-7.3.11-bookworm, 2.7-7.3-bookworm, 2.7-7-bookworm, 2.7-bookworm, 2-7.3.11-bookworm, 2-7.3-bookworm, 2-7-bookworm, 2-bookworm
+Architectures: amd64, arm64v8, i386
+GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
+Directory: 2.7/bookworm
+
Tags: 2.7-7.3.11-bullseye, 2.7-7.3-bullseye, 2.7-7-bullseye, 2.7-bullseye, 2-7.3.11-bullseye, 2-7.3-bullseye, 2-7-bullseye, 2-bullseye
SharedTags: 2.7-7.3.11, 2.7-7.3, 2.7-7, 2.7, 2-7.3.11, 2-7.3, 2-7, 2
Architectures: amd64, arm64v8, i386
-GitCommit: 6984fd15d26f75e4078da3380ba405c41f585f98
+GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
Directory: 2.7/bullseye
-Tags: 2.7-7.3.11-buster, 2.7-7.3-buster, 2.7-7-buster, 2.7-buster, 2-7.3.11-buster, 2-7.3-buster, 2-7-buster, 2-buster
-Architectures: amd64, arm64v8, i386
-GitCommit: 6984fd15d26f75e4078da3380ba405c41f585f98
-Directory: 2.7/buster
-
Tags: 2.7-7.3.11-slim, 2.7-7.3-slim, 2.7-7-slim, 2.7-slim, 2-7.3.11-slim, 2-7.3-slim, 2-7-slim, 2-slim, 2.7-7.3.11-slim-bullseye, 2.7-7.3-slim-bullseye, 2.7-7-slim-bullseye, 2.7-slim-bullseye, 2-7.3.11-slim-bullseye, 2-7.3-slim-bullseye, 2-7-slim-bullseye, 2-slim-bullseye
Architectures: amd64, arm64v8, i386
-GitCommit: 6984fd15d26f75e4078da3380ba405c41f585f98
+GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
Directory: 2.7/slim-bullseye
-Tags: 2.7-7.3.11-slim-buster, 2.7-7.3-slim-buster, 2.7-7-slim-buster, 2.7-slim-buster, 2-7.3.11-slim-buster, 2-7.3-slim-buster, 2-7-slim-buster, 2-slim-buster
+Tags: 2.7-7.3.11-slim-bookworm, 2.7-7.3-slim-bookworm, 2.7-7-slim-bookworm, 2.7-slim-bookworm, 2-7.3.11-slim-bookworm, 2-7.3-slim-bookworm, 2-7-slim-bookworm, 2-slim-bookworm
Architectures: amd64, arm64v8, i386
-GitCommit: 6984fd15d26f75e4078da3380ba405c41f585f98
-Directory: 2.7/slim-buster
+GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
+Directory: 2.7/slim-bookworm
Tags: 2.7-7.3.11-windowsservercore-1809, 2.7-7.3-windowsservercore-1809, 2.7-7-windowsservercore-1809, 2.7-windowsservercore-1809, 2-7.3.11-windowsservercore-1809, 2-7.3-windowsservercore-1809, 2-7-windowsservercore-1809, 2-windowsservercore-1809
SharedTags: 2.7-7.3.11, 2.7-7.3, 2.7-7, 2.7, 2-7.3.11, 2-7.3, 2-7, 2, 2.7-7.3.11-windowsservercore, 2.7-7.3-windowsservercore, 2.7-7-windowsservercore, 2.7-windowsservercore, 2-7.3.11-windowsservercore, 2-7.3-windowsservercore, 2-7-windowsservercore, 2-windowsservercore
@@ -36,26 +36,26 @@ GitCommit: 6984fd15d26f75e4078da3380ba405c41f585f98
Directory: 2.7/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
+Tags: 3.8-7.3.11-bookworm, 3.8-7.3-bookworm, 3.8-7-bookworm, 3.8-bookworm
+Architectures: amd64, arm64v8, i386
+GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
+Directory: 3.8/bookworm
+
Tags: 3.8-7.3.11-bullseye, 3.8-7.3-bullseye, 3.8-7-bullseye, 3.8-bullseye
SharedTags: 3.8-7.3.11, 3.8-7.3, 3.8-7, 3.8
Architectures: amd64, arm64v8, i386
-GitCommit: 86944b577ee5ad8fe08db64900a9151abd5a8e3b
+GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
Directory: 3.8/bullseye
-Tags: 3.8-7.3.11-buster, 3.8-7.3-buster, 3.8-7-buster, 3.8-buster
-Architectures: amd64, arm64v8, i386
-GitCommit: 86944b577ee5ad8fe08db64900a9151abd5a8e3b
-Directory: 3.8/buster
-
Tags: 3.8-7.3.11-slim, 3.8-7.3-slim, 3.8-7-slim, 3.8-slim, 3.8-7.3.11-slim-bullseye, 3.8-7.3-slim-bullseye, 3.8-7-slim-bullseye, 3.8-slim-bullseye
Architectures: amd64, arm64v8, i386
-GitCommit: 86944b577ee5ad8fe08db64900a9151abd5a8e3b
+GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
Directory: 3.8/slim-bullseye
-Tags: 3.8-7.3.11-slim-buster, 3.8-7.3-slim-buster, 3.8-7-slim-buster, 3.8-slim-buster
+Tags: 3.8-7.3.11-slim-bookworm, 3.8-7.3-slim-bookworm, 3.8-7-slim-bookworm, 3.8-slim-bookworm
Architectures: amd64, arm64v8, i386
-GitCommit: 86944b577ee5ad8fe08db64900a9151abd5a8e3b
-Directory: 3.8/slim-buster
+GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
+Directory: 3.8/slim-bookworm
Tags: 3.8-7.3.11-windowsservercore-1809, 3.8-7.3-windowsservercore-1809, 3.8-7-windowsservercore-1809, 3.8-windowsservercore-1809
SharedTags: 3.8-7.3.11, 3.8-7.3, 3.8-7, 3.8, 3.8-7.3.11-windowsservercore, 3.8-7.3-windowsservercore, 3.8-7-windowsservercore, 3.8-windowsservercore
@@ -71,26 +71,26 @@ GitCommit: 86944b577ee5ad8fe08db64900a9151abd5a8e3b
Directory: 3.8/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
+Tags: 3.9-7.3.11-bookworm, 3.9-7.3-bookworm, 3.9-7-bookworm, 3.9-bookworm, 3-7.3.11-bookworm, 3-7.3-bookworm, 3-7-bookworm, 3-bookworm, bookworm
+Architectures: amd64, arm64v8, i386
+GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
+Directory: 3.9/bookworm
+
Tags: 3.9-7.3.11-bullseye, 3.9-7.3-bullseye, 3.9-7-bullseye, 3.9-bullseye, 3-7.3.11-bullseye, 3-7.3-bullseye, 3-7-bullseye, 3-bullseye, bullseye
SharedTags: 3.9-7.3.11, 3.9-7.3, 3.9-7, 3.9, 3-7.3.11, 3-7.3, 3-7, 3, latest
Architectures: amd64, arm64v8, i386
-GitCommit: f297f09255e5a53036355e2e4135c75542099641
+GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
Directory: 3.9/bullseye
-Tags: 3.9-7.3.11-buster, 3.9-7.3-buster, 3.9-7-buster, 3.9-buster, 3-7.3.11-buster, 3-7.3-buster, 3-7-buster, 3-buster, buster
-Architectures: amd64, arm64v8, i386
-GitCommit: f297f09255e5a53036355e2e4135c75542099641
-Directory: 3.9/buster
-
Tags: 3.9-7.3.11-slim, 3.9-7.3-slim, 3.9-7-slim, 3.9-slim, 3-7.3.11-slim, 3-7.3-slim, 3-7-slim, 3-slim, slim, 3.9-7.3.11-slim-bullseye, 3.9-7.3-slim-bullseye, 3.9-7-slim-bullseye, 3.9-slim-bullseye, 3-7.3.11-slim-bullseye, 3-7.3-slim-bullseye, 3-7-slim-bullseye, 3-slim-bullseye, slim-bullseye
Architectures: amd64, arm64v8, i386
-GitCommit: f297f09255e5a53036355e2e4135c75542099641
+GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
Directory: 3.9/slim-bullseye
-Tags: 3.9-7.3.11-slim-buster, 3.9-7.3-slim-buster, 3.9-7-slim-buster, 3.9-slim-buster, 3-7.3.11-slim-buster, 3-7.3-slim-buster, 3-7-slim-buster, 3-slim-buster, slim-buster
+Tags: 3.9-7.3.11-slim-bookworm, 3.9-7.3-slim-bookworm, 3.9-7-slim-bookworm, 3.9-slim-bookworm, 3-7.3.11-slim-bookworm, 3-7.3-slim-bookworm, 3-7-slim-bookworm, 3-slim-bookworm, slim-bookworm
Architectures: amd64, arm64v8, i386
-GitCommit: f297f09255e5a53036355e2e4135c75542099641
-Directory: 3.9/slim-buster
+GitCommit: 9a9efe06150ce464f288617c8e3ec765bb93250e
+Directory: 3.9/slim-bookworm
Tags: 3.9-7.3.11-windowsservercore-1809, 3.9-7.3-windowsservercore-1809, 3.9-7-windowsservercore-1809, 3.9-windowsservercore-1809, 3-7.3.11-windowsservercore-1809, 3-7.3-windowsservercore-1809, 3-7-windowsservercore-1809, 3-windowsservercore-1809, windowsservercore-1809
SharedTags: 3.9-7.3.11, 3.9-7.3, 3.9-7, 3.9, 3-7.3.11, 3-7.3, 3-7, 3, latest, 3.9-7.3.11-windowsservercore, 3.9-7.3-windowsservercore, 3.9-7-windowsservercore, 3.9-windowsservercore, 3-7.3.11-windowsservercore, 3-7.3-windowsservercore, 3-7-windowsservercore, 3-windowsservercore, windowsservercore
diff --git a/_bashbrew-list b/_bashbrew-list
index 3510a51..853982b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,189 +1,189 @@
pypy:2
pypy:2-7
+pypy:2-7-bookworm
pypy:2-7-bullseye
-pypy:2-7-buster
pypy:2-7-slim
+pypy:2-7-slim-bookworm
pypy:2-7-slim-bullseye
-pypy:2-7-slim-buster
pypy:2-7-windowsservercore
pypy:2-7-windowsservercore-1809
pypy:2-7-windowsservercore-ltsc2022
pypy:2-7.3
+pypy:2-7.3-bookworm
pypy:2-7.3-bullseye
-pypy:2-7.3-buster
pypy:2-7.3-slim
+pypy:2-7.3-slim-bookworm
pypy:2-7.3-slim-bullseye
-pypy:2-7.3-slim-buster
pypy:2-7.3-windowsservercore
pypy:2-7.3-windowsservercore-1809
pypy:2-7.3-windowsservercore-ltsc2022
pypy:2-7.3.11
+pypy:2-7.3.11-bookworm
pypy:2-7.3.11-bullseye
-pypy:2-7.3.11-buster
pypy:2-7.3.11-slim
+pypy:2-7.3.11-slim-bookworm
pypy:2-7.3.11-slim-bullseye
-pypy:2-7.3.11-slim-buster
pypy:2-7.3.11-windowsservercore
pypy:2-7.3.11-windowsservercore-1809
pypy:2-7.3.11-windowsservercore-ltsc2022
+pypy:2-bookworm
pypy:2-bullseye
-pypy:2-buster
pypy:2-slim
+pypy:2-slim-bookworm
pypy:2-slim-bullseye
-pypy:2-slim-buster
pypy:2-windowsservercore
pypy:2-windowsservercore-1809
pypy:2-windowsservercore-ltsc2022
pypy:2.7
pypy:2.7-7
+pypy:2.7-7-bookworm
pypy:2.7-7-bullseye
-pypy:2.7-7-buster
pypy:2.7-7-slim
+pypy:2.7-7-slim-bookworm
pypy:2.7-7-slim-bullseye
-pypy:2.7-7-slim-buster
pypy:2.7-7-windowsservercore
pypy:2.7-7-windowsservercore-1809
pypy:2.7-7-windowsservercore-ltsc2022
pypy:2.7-7.3
+pypy:2.7-7.3-bookworm
pypy:2.7-7.3-bullseye
-pypy:2.7-7.3-buster
pypy:2.7-7.3-slim
+pypy:2.7-7.3-slim-bookworm
pypy:2.7-7.3-slim-bullseye
-pypy:2.7-7.3-slim-buster
pypy:2.7-7.3-windowsservercore
pypy:2.7-7.3-windowsservercore-1809
pypy:2.7-7.3-windowsservercore-ltsc2022
pypy:2.7-7.3.11
+pypy:2.7-7.3.11-bookworm
pypy:2.7-7.3.11-bullseye
-pypy:2.7-7.3.11-buster
pypy:2.7-7.3.11-slim
+pypy:2.7-7.3.11-slim-bookworm
pypy:2.7-7.3.11-slim-bullseye
-pypy:2.7-7.3.11-slim-buster
pypy:2.7-7.3.11-windowsservercore
pypy:2.7-7.3.11-windowsservercore-1809
pypy:2.7-7.3.11-windowsservercore-ltsc2022
+pypy:2.7-bookworm
pypy:2.7-bullseye
-pypy:2.7-buster
pypy:2.7-slim
+pypy:2.7-slim-bookworm
pypy:2.7-slim-bullseye
-pypy:2.7-slim-buster
pypy:2.7-windowsservercore
pypy:2.7-windowsservercore-1809
pypy:2.7-windowsservercore-ltsc2022
pypy:3
pypy:3-7
+pypy:3-7-bookworm
pypy:3-7-bullseye
-pypy:3-7-buster
pypy:3-7-slim
+pypy:3-7-slim-bookworm
pypy:3-7-slim-bullseye
-pypy:3-7-slim-buster
pypy:3-7-windowsservercore
pypy:3-7-windowsservercore-1809
pypy:3-7-windowsservercore-ltsc2022
pypy:3-7.3
+pypy:3-7.3-bookworm
pypy:3-7.3-bullseye
-pypy:3-7.3-buster
pypy:3-7.3-slim
+pypy:3-7.3-slim-bookworm
pypy:3-7.3-slim-bullseye
-pypy:3-7.3-slim-buster
pypy:3-7.3-windowsservercore
pypy:3-7.3-windowsservercore-1809
pypy:3-7.3-windowsservercore-ltsc2022
pypy:3-7.3.11
+pypy:3-7.3.11-bookworm
pypy:3-7.3.11-bullseye
-pypy:3-7.3.11-buster
pypy:3-7.3.11-slim
+pypy:3-7.3.11-slim-bookworm
pypy:3-7.3.11-slim-bullseye
-pypy:3-7.3.11-slim-buster
pypy:3-7.3.11-windowsservercore
pypy:3-7.3.11-windowsservercore-1809
pypy:3-7.3.11-windowsservercore-ltsc2022
+pypy:3-bookworm
pypy:3-bullseye
-pypy:3-buster
pypy:3-slim
+pypy:3-slim-bookworm
pypy:3-slim-bullseye
-pypy:3-slim-buster
pypy:3-windowsservercore
pypy:3-windowsservercore-1809
pypy:3-windowsservercore-ltsc2022
pypy:3.8
pypy:3.8-7
+pypy:3.8-7-bookworm
pypy:3.8-7-bullseye
-pypy:3.8-7-buster
pypy:3.8-7-slim
+pypy:3.8-7-slim-bookworm
pypy:3.8-7-slim-bullseye
-pypy:3.8-7-slim-buster
pypy:3.8-7-windowsservercore
pypy:3.8-7-windowsservercore-1809
pypy:3.8-7-windowsservercore-ltsc2022
pypy:3.8-7.3
+pypy:3.8-7.3-bookworm
pypy:3.8-7.3-bullseye
-pypy:3.8-7.3-buster
pypy:3.8-7.3-slim
+pypy:3.8-7.3-slim-bookworm
pypy:3.8-7.3-slim-bullseye
-pypy:3.8-7.3-slim-buster
pypy:3.8-7.3-windowsservercore
pypy:3.8-7.3-windowsservercore-1809
pypy:3.8-7.3-windowsservercore-ltsc2022
pypy:3.8-7.3.11
+pypy:3.8-7.3.11-bookworm
pypy:3.8-7.3.11-bullseye
-pypy:3.8-7.3.11-buster
pypy:3.8-7.3.11-slim
+pypy:3.8-7.3.11-slim-bookworm
pypy:3.8-7.3.11-slim-bullseye
-pypy:3.8-7.3.11-slim-buster
pypy:3.8-7.3.11-windowsservercore
pypy:3.8-7.3.11-windowsservercore-1809
pypy:3.8-7.3.11-windowsservercore-ltsc2022
+pypy:3.8-bookworm
pypy:3.8-bullseye
-pypy:3.8-buster
pypy:3.8-slim
+pypy:3.8-slim-bookworm
pypy:3.8-slim-bullseye
-pypy:3.8-slim-buster
pypy:3.8-windowsservercore
pypy:3.8-windowsservercore-1809
pypy:3.8-windowsservercore-ltsc2022
pypy:3.9
pypy:3.9-7
+pypy:3.9-7-bookworm
pypy:3.9-7-bullseye
-pypy:3.9-7-buster
pypy:3.9-7-slim
+pypy:3.9-7-slim-bookworm
pypy:3.9-7-slim-bullseye
-pypy:3.9-7-slim-buster
pypy:3.9-7-windowsservercore
pypy:3.9-7-windowsservercore-1809
pypy:3.9-7-windowsservercore-ltsc2022
pypy:3.9-7.3
+pypy:3.9-7.3-bookworm
pypy:3.9-7.3-bullseye
-pypy:3.9-7.3-buster
pypy:3.9-7.3-slim
+pypy:3.9-7.3-slim-bookworm
pypy:3.9-7.3-slim-bullseye
-pypy:3.9-7.3-slim-buster
pypy:3.9-7.3-windowsservercore
pypy:3.9-7.3-windowsservercore-1809
pypy:3.9-7.3-windowsservercore-ltsc2022
pypy:3.9-7.3.11
+pypy:3.9-7.3.11-bookworm
pypy:3.9-7.3.11-bullseye
-pypy:3.9-7.3.11-buster
pypy:3.9-7.3.11-slim
+pypy:3.9-7.3.11-slim-bookworm
pypy:3.9-7.3.11-slim-bullseye
-pypy:3.9-7.3.11-slim-buster
pypy:3.9-7.3.11-windowsservercore
pypy:3.9-7.3.11-windowsservercore-1809
pypy:3.9-7.3.11-windowsservercore-ltsc2022
+pypy:3.9-bookworm
pypy:3.9-bullseye
-pypy:3.9-buster
pypy:3.9-slim
+pypy:3.9-slim-bookworm
pypy:3.9-slim-bullseye
-pypy:3.9-slim-buster
pypy:3.9-windowsservercore
pypy:3.9-windowsservercore-1809
pypy:3.9-windowsservercore-ltsc2022
+pypy:bookworm
pypy:bullseye
-pypy:buster
pypy:latest
pypy:slim
+pypy:slim-bookworm
pypy:slim-bullseye
-pypy:slim-buster
pypy:windowsservercore
pypy:windowsservercore-1809
pypy:windowsservercore-ltsc2022
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index c526a6d..8cabd49 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,18 +1,18 @@
+pypy:2-bookworm
pypy:2-bullseye
-pypy:2-buster
pypy:2-slim-bullseye
-pypy:2-slim-buster
+pypy:2-slim-bookworm
pypy:2-windowsservercore-1809
pypy:2-windowsservercore-ltsc2022
+pypy:3.8-bookworm
pypy:3.8-bullseye
-pypy:3.8-buster
pypy:3.8-slim-bullseye
-pypy:3.8-slim-buster
+pypy:3.8-slim-bookworm
pypy:3.8-windowsservercore-1809
pypy:3.8-windowsservercore-ltsc2022
+pypy:bookworm
pypy:bullseye
-pypy:buster
pypy:slim-bullseye
-pypy:slim-buster
+pypy:slim-bookworm
pypy:windowsservercore-1809
pypy:windowsservercore-ltsc2022
diff --git a/pypy_2-buster/Dockerfile b/pypy_2-bookworm/Dockerfile
similarity index 96%
rename from pypy_2-buster/Dockerfile
rename to pypy_2-bookworm/Dockerfile
index 8999c5c..61bfe50 100644
--- a/pypy_2-buster/Dockerfile
+++ b/pypy_2-bookworm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:buster
+FROM buildpack-deps:bookworm
# runtime dependencies
RUN set -eux; \
@@ -74,7 +74,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
find /opt/pypy -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/pypy_2-bullseye/Dockerfile b/pypy_2-bullseye/Dockerfile
index f127e93..4459349 100644
--- a/pypy_2-bullseye/Dockerfile
+++ b/pypy_2-bullseye/Dockerfile
@@ -74,7 +74,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
find /opt/pypy -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/pypy_2-slim-buster/Dockerfile b/pypy_2-slim-bookworm/Dockerfile
similarity index 96%
rename from pypy_2-slim-buster/Dockerfile
rename to pypy_2-slim-bookworm/Dockerfile
index a5085e5..036a597 100644
--- a/pypy_2-slim-buster/Dockerfile
+++ b/pypy_2-slim-bookworm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bookworm-slim
RUN set -eux; \
apt-get update; \
@@ -72,7 +72,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
find /opt/pypy -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/pypy_2-slim-bullseye/Dockerfile b/pypy_2-slim-bullseye/Dockerfile
index b60ec6f..f896837 100644
--- a/pypy_2-slim-bullseye/Dockerfile
+++ b/pypy_2-slim-bullseye/Dockerfile
@@ -72,7 +72,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
find /opt/pypy -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/pypy_3.8-buster/Dockerfile b/pypy_3.8-bookworm/Dockerfile
similarity index 96%
rename from pypy_3.8-buster/Dockerfile
rename to pypy_3.8-bookworm/Dockerfile
index 84f61e9..00cdb19 100644
--- a/pypy_3.8-buster/Dockerfile
+++ b/pypy_3.8-bookworm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:buster
+FROM buildpack-deps:bookworm
# runtime dependencies
RUN set -eux; \
@@ -93,7 +93,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
find /opt/pypy -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/pypy_3.8-bullseye/Dockerfile b/pypy_3.8-bullseye/Dockerfile
index 5090d50..81c4895 100644
--- a/pypy_3.8-bullseye/Dockerfile
+++ b/pypy_3.8-bullseye/Dockerfile
@@ -93,7 +93,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
find /opt/pypy -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/pypy_3.8-slim-buster/Dockerfile b/pypy_3.8-slim-bookworm/Dockerfile
similarity index 97%
rename from pypy_3.8-slim-buster/Dockerfile
rename to pypy_3.8-slim-bookworm/Dockerfile
index 20a5a3e..72d73c3 100644
--- a/pypy_3.8-slim-buster/Dockerfile
+++ b/pypy_3.8-slim-bookworm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bookworm-slim
RUN set -eux; \
apt-get update; \
@@ -95,7 +95,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
find /opt/pypy -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/pypy_3.8-slim-bullseye/Dockerfile b/pypy_3.8-slim-bullseye/Dockerfile
index e3e171f..bb5bf94 100644
--- a/pypy_3.8-slim-bullseye/Dockerfile
+++ b/pypy_3.8-slim-bullseye/Dockerfile
@@ -95,7 +95,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
find /opt/pypy -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/pypy_buster/Dockerfile b/pypy_bookworm/Dockerfile
similarity index 96%
rename from pypy_buster/Dockerfile
rename to pypy_bookworm/Dockerfile
index 0b57782..7b13a09 100644
--- a/pypy_buster/Dockerfile
+++ b/pypy_bookworm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM buildpack-deps:buster
+FROM buildpack-deps:bookworm
# runtime dependencies
RUN set -eux; \
@@ -93,7 +93,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
find /opt/pypy -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/pypy_bullseye/Dockerfile b/pypy_bullseye/Dockerfile
index 0c9c0b4..6c10171 100644
--- a/pypy_bullseye/Dockerfile
+++ b/pypy_bullseye/Dockerfile
@@ -93,7 +93,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
find /opt/pypy -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/pypy_slim-buster/Dockerfile b/pypy_slim-bookworm/Dockerfile
similarity index 97%
rename from pypy_slim-buster/Dockerfile
rename to pypy_slim-bookworm/Dockerfile
index cf02b88..f305597 100644
--- a/pypy_slim-buster/Dockerfile
+++ b/pypy_slim-bookworm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM debian:buster-slim
+FROM debian:bookworm-slim
RUN set -eux; \
apt-get update; \
@@ -95,7 +95,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
find /opt/pypy -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \
diff --git a/pypy_slim-bullseye/Dockerfile b/pypy_slim-bullseye/Dockerfile
index 201737d..93983cd 100644
--- a/pypy_slim-bullseye/Dockerfile
+++ b/pypy_slim-bullseye/Dockerfile
@@ -95,7 +95,7 @@ RUN set -eux; \
apt-mark auto '.*' > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
find /opt/pypy -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
+ | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
| sort -u \
| xargs -r dpkg-query --search \
| cut -d: -f1 \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: