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 python #14854

Merged
merged 1 commit into from
Jun 14, 2023
Merged

Update python #14854

merged 1 commit into from
Jun 14, 2023

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 14, 2023

Changes:

Changes:

- docker-library/python@9a7a540: Merge pull request docker-library/python#822 from sspans-sbp/master
- docker-library/python@5d908b0: add bookworm, remove buster
@github-actions
Copy link

Diff for 42891ec:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 22c6504..7815cb5 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -12,27 +12,27 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 00b80a3dfc595e9c58ec52cc9ae8349cf10767a4
 Directory: 3.7/alpine3.18
 
-Tags: 3.7.17-bullseye, 3.7-bullseye
+Tags: 3.7.17-bookworm, 3.7-bookworm
 SharedTags: 3.7.17, 3.7
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
+Directory: 3.7/bookworm
+
+Tags: 3.7.17-bullseye, 3.7-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 00b80a3dfc595e9c58ec52cc9ae8349cf10767a4
 Directory: 3.7/bullseye
 
-Tags: 3.7.17-buster, 3.7-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 00b80a3dfc595e9c58ec52cc9ae8349cf10767a4
-Directory: 3.7/buster
+Tags: 3.7.17-slim-bookworm, 3.7-slim-bookworm, 3.7.17-slim, 3.7-slim
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
+Directory: 3.7/slim-bookworm
 
-Tags: 3.7.17-slim-bullseye, 3.7-slim-bullseye, 3.7.17-slim, 3.7-slim
+Tags: 3.7.17-slim-bullseye, 3.7-slim-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 00b80a3dfc595e9c58ec52cc9ae8349cf10767a4
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
 Directory: 3.7/slim-bullseye
 
-Tags: 3.7.17-slim-buster, 3.7-slim-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 00b80a3dfc595e9c58ec52cc9ae8349cf10767a4
-Directory: 3.7/slim-buster
-
 Tags: 3.8.17-alpine3.17, 3.8-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: db8907eb3797ad147b59759aa1e6d7708a3fc2ce
@@ -43,27 +43,27 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: db8907eb3797ad147b59759aa1e6d7708a3fc2ce
 Directory: 3.8/alpine3.18
 
-Tags: 3.8.17-bullseye, 3.8-bullseye
+Tags: 3.8.17-bookworm, 3.8-bookworm
 SharedTags: 3.8.17, 3.8
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
+Directory: 3.8/bookworm
+
+Tags: 3.8.17-bullseye, 3.8-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: db8907eb3797ad147b59759aa1e6d7708a3fc2ce
 Directory: 3.8/bullseye
 
-Tags: 3.8.17-buster, 3.8-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: db8907eb3797ad147b59759aa1e6d7708a3fc2ce
-Directory: 3.8/buster
+Tags: 3.8.17-slim-bookworm, 3.8-slim-bookworm, 3.8.17-slim, 3.8-slim
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
+Directory: 3.8/slim-bookworm
 
-Tags: 3.8.17-slim-bullseye, 3.8-slim-bullseye, 3.8.17-slim, 3.8-slim
+Tags: 3.8.17-slim-bullseye, 3.8-slim-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: db8907eb3797ad147b59759aa1e6d7708a3fc2ce
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
 Directory: 3.8/slim-bullseye
 
-Tags: 3.8.17-slim-buster, 3.8-slim-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: db8907eb3797ad147b59759aa1e6d7708a3fc2ce
-Directory: 3.8/slim-buster
-
 Tags: 3.9.17-alpine3.17, 3.9-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 40bd50cfcf3551fc506b45e47003db9c52c5fec7
@@ -74,27 +74,27 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 40bd50cfcf3551fc506b45e47003db9c52c5fec7
 Directory: 3.9/alpine3.18
 
-Tags: 3.9.17-bullseye, 3.9-bullseye
+Tags: 3.9.17-bookworm, 3.9-bookworm
 SharedTags: 3.9.17, 3.9
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
+Directory: 3.9/bookworm
+
+Tags: 3.9.17-bullseye, 3.9-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 40bd50cfcf3551fc506b45e47003db9c52c5fec7
 Directory: 3.9/bullseye
 
-Tags: 3.9.17-buster, 3.9-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 40bd50cfcf3551fc506b45e47003db9c52c5fec7
-Directory: 3.9/buster
+Tags: 3.9.17-slim-bookworm, 3.9-slim-bookworm, 3.9.17-slim, 3.9-slim
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
+Directory: 3.9/slim-bookworm
 
-Tags: 3.9.17-slim-bullseye, 3.9-slim-bullseye, 3.9.17-slim, 3.9-slim
+Tags: 3.9.17-slim-bullseye, 3.9-slim-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 40bd50cfcf3551fc506b45e47003db9c52c5fec7
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
 Directory: 3.9/slim-bullseye
 
-Tags: 3.9.17-slim-buster, 3.9-slim-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 40bd50cfcf3551fc506b45e47003db9c52c5fec7
-Directory: 3.9/slim-buster
-
 Tags: 3.10.12-alpine3.17, 3.10-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 8f971d595fff0cc134370916a069bfedc5887308
@@ -105,27 +105,27 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 8f971d595fff0cc134370916a069bfedc5887308
 Directory: 3.10/alpine3.18
 
-Tags: 3.10.12-bullseye, 3.10-bullseye
+Tags: 3.10.12-bookworm, 3.10-bookworm
 SharedTags: 3.10.12, 3.10
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
+Directory: 3.10/bookworm
+
+Tags: 3.10.12-bullseye, 3.10-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 8f971d595fff0cc134370916a069bfedc5887308
 Directory: 3.10/bullseye
 
-Tags: 3.10.12-buster, 3.10-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 8f971d595fff0cc134370916a069bfedc5887308
-Directory: 3.10/buster
+Tags: 3.10.12-slim-bookworm, 3.10-slim-bookworm, 3.10.12-slim, 3.10-slim
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
+Directory: 3.10/slim-bookworm
 
-Tags: 3.10.12-slim-bullseye, 3.10-slim-bullseye, 3.10.12-slim, 3.10-slim
+Tags: 3.10.12-slim-bullseye, 3.10-slim-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 8f971d595fff0cc134370916a069bfedc5887308
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
 Directory: 3.10/slim-bullseye
 
-Tags: 3.10.12-slim-buster, 3.10-slim-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 8f971d595fff0cc134370916a069bfedc5887308
-Directory: 3.10/slim-buster
-
 Tags: 3.11.4-alpine3.17, 3.11-alpine3.17, 3-alpine3.17, alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: b744d9708a2fb8e2295198ef146341c415e9bc28
@@ -136,27 +136,27 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: b744d9708a2fb8e2295198ef146341c415e9bc28
 Directory: 3.11/alpine3.18
 
-Tags: 3.11.4-bullseye, 3.11-bullseye, 3-bullseye, bullseye
+Tags: 3.11.4-bookworm, 3.11-bookworm, 3-bookworm, bookworm
 SharedTags: 3.11.4, 3.11, 3, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
+Directory: 3.11/bookworm
+
+Tags: 3.11.4-bullseye, 3.11-bullseye, 3-bullseye, bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: b744d9708a2fb8e2295198ef146341c415e9bc28
 Directory: 3.11/bullseye
 
-Tags: 3.11.4-buster, 3.11-buster, 3-buster, buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: b744d9708a2fb8e2295198ef146341c415e9bc28
-Directory: 3.11/buster
+Tags: 3.11.4-slim-bookworm, 3.11-slim-bookworm, 3-slim-bookworm, slim-bookworm, 3.11.4-slim, 3.11-slim, 3-slim, slim
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
+Directory: 3.11/slim-bookworm
 
-Tags: 3.11.4-slim-bullseye, 3.11-slim-bullseye, 3-slim-bullseye, slim-bullseye, 3.11.4-slim, 3.11-slim, 3-slim, slim
+Tags: 3.11.4-slim-bullseye, 3.11-slim-bullseye, 3-slim-bullseye, slim-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b744d9708a2fb8e2295198ef146341c415e9bc28
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
 Directory: 3.11/slim-bullseye
 
-Tags: 3.11.4-slim-buster, 3.11-slim-buster, 3-slim-buster, slim-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: b744d9708a2fb8e2295198ef146341c415e9bc28
-Directory: 3.11/slim-buster
-
 Tags: 3.11.4-windowsservercore-1809, 3.11-windowsservercore-1809, 3-windowsservercore-1809, windowsservercore-1809
 SharedTags: 3.11.4-windowsservercore, 3.11-windowsservercore, 3-windowsservercore, windowsservercore, 3.11.4, 3.11, 3, latest
 Architectures: windows-amd64
@@ -183,27 +183,27 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: de2ce8ecb7b5522262dd97e8e87739e4b6d1e6bf
 Directory: 3.12-rc/alpine3.18
 
-Tags: 3.12.0b2-bullseye, 3.12-rc-bullseye
+Tags: 3.12.0b2-bookworm, 3.12-rc-bookworm
 SharedTags: 3.12.0b2, 3.12-rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
+Directory: 3.12-rc/bookworm
+
+Tags: 3.12.0b2-bullseye, 3.12-rc-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: de2ce8ecb7b5522262dd97e8e87739e4b6d1e6bf
 Directory: 3.12-rc/bullseye
 
-Tags: 3.12.0b2-buster, 3.12-rc-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: de2ce8ecb7b5522262dd97e8e87739e4b6d1e6bf
-Directory: 3.12-rc/buster
+Tags: 3.12.0b2-slim-bookworm, 3.12-rc-slim-bookworm, 3.12.0b2-slim, 3.12-rc-slim
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
+Directory: 3.12-rc/slim-bookworm
 
-Tags: 3.12.0b2-slim-bullseye, 3.12-rc-slim-bullseye, 3.12.0b2-slim, 3.12-rc-slim
+Tags: 3.12.0b2-slim-bullseye, 3.12-rc-slim-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: de2ce8ecb7b5522262dd97e8e87739e4b6d1e6bf
+GitCommit: 5d908b0477c003712550c84ac4d133367b912f78
 Directory: 3.12-rc/slim-bullseye
 
-Tags: 3.12.0b2-slim-buster, 3.12-rc-slim-buster
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: de2ce8ecb7b5522262dd97e8e87739e4b6d1e6bf
-Directory: 3.12-rc/slim-buster
-
 Tags: 3.12.0b2-windowsservercore-1809, 3.12-rc-windowsservercore-1809
 SharedTags: 3.12.0b2-windowsservercore, 3.12-rc-windowsservercore, 3.12.0b2, 3.12-rc
 Architectures: windows-amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 29f4e54..31c48f9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,11 +2,11 @@ python:3
 python:3-alpine
 python:3-alpine3.17
 python:3-alpine3.18
+python:3-bookworm
 python:3-bullseye
-python:3-buster
 python:3-slim
+python:3-slim-bookworm
 python:3-slim-bullseye
-python:3-slim-buster
 python:3-windowsservercore
 python:3-windowsservercore-1809
 python:3-windowsservercore-ltsc2022
@@ -14,83 +14,83 @@ python:3.7
 python:3.7-alpine
 python:3.7-alpine3.17
 python:3.7-alpine3.18
+python:3.7-bookworm
 python:3.7-bullseye
-python:3.7-buster
 python:3.7-slim
+python:3.7-slim-bookworm
 python:3.7-slim-bullseye
-python:3.7-slim-buster
 python:3.7.17
 python:3.7.17-alpine
 python:3.7.17-alpine3.17
 python:3.7.17-alpine3.18
+python:3.7.17-bookworm
 python:3.7.17-bullseye
-python:3.7.17-buster
 python:3.7.17-slim
+python:3.7.17-slim-bookworm
 python:3.7.17-slim-bullseye
-python:3.7.17-slim-buster
 python:3.8
 python:3.8-alpine
 python:3.8-alpine3.17
 python:3.8-alpine3.18
+python:3.8-bookworm
 python:3.8-bullseye
-python:3.8-buster
 python:3.8-slim
+python:3.8-slim-bookworm
 python:3.8-slim-bullseye
-python:3.8-slim-buster
 python:3.8.17
 python:3.8.17-alpine
 python:3.8.17-alpine3.17
 python:3.8.17-alpine3.18
+python:3.8.17-bookworm
 python:3.8.17-bullseye
-python:3.8.17-buster
 python:3.8.17-slim
+python:3.8.17-slim-bookworm
 python:3.8.17-slim-bullseye
-python:3.8.17-slim-buster
 python:3.9
 python:3.9-alpine
 python:3.9-alpine3.17
 python:3.9-alpine3.18
+python:3.9-bookworm
 python:3.9-bullseye
-python:3.9-buster
 python:3.9-slim
+python:3.9-slim-bookworm
 python:3.9-slim-bullseye
-python:3.9-slim-buster
 python:3.9.17
 python:3.9.17-alpine
 python:3.9.17-alpine3.17
 python:3.9.17-alpine3.18
+python:3.9.17-bookworm
 python:3.9.17-bullseye
-python:3.9.17-buster
 python:3.9.17-slim
+python:3.9.17-slim-bookworm
 python:3.9.17-slim-bullseye
-python:3.9.17-slim-buster
 python:3.10
 python:3.10-alpine
 python:3.10-alpine3.17
 python:3.10-alpine3.18
+python:3.10-bookworm
 python:3.10-bullseye
-python:3.10-buster
 python:3.10-slim
+python:3.10-slim-bookworm
 python:3.10-slim-bullseye
-python:3.10-slim-buster
 python:3.10.12
 python:3.10.12-alpine
 python:3.10.12-alpine3.17
 python:3.10.12-alpine3.18
+python:3.10.12-bookworm
 python:3.10.12-bullseye
-python:3.10.12-buster
 python:3.10.12-slim
+python:3.10.12-slim-bookworm
 python:3.10.12-slim-bullseye
-python:3.10.12-slim-buster
 python:3.11
 python:3.11-alpine
 python:3.11-alpine3.17
 python:3.11-alpine3.18
+python:3.11-bookworm
 python:3.11-bullseye
-python:3.11-buster
 python:3.11-slim
+python:3.11-slim-bookworm
 python:3.11-slim-bullseye
-python:3.11-slim-buster
 python:3.11-windowsservercore
 python:3.11-windowsservercore-1809
 python:3.11-windowsservercore-ltsc2022
@@ -98,11 +98,11 @@ python:3.11.4
 python:3.11.4-alpine
 python:3.11.4-alpine3.17
 python:3.11.4-alpine3.18
+python:3.11.4-bookworm
 python:3.11.4-bullseye
-python:3.11.4-buster
 python:3.11.4-slim
+python:3.11.4-slim-bookworm
 python:3.11.4-slim-bullseye
-python:3.11.4-slim-buster
 python:3.11.4-windowsservercore
 python:3.11.4-windowsservercore-1809
 python:3.11.4-windowsservercore-ltsc2022
@@ -110,11 +110,11 @@ python:3.12-rc
 python:3.12-rc-alpine
 python:3.12-rc-alpine3.17
 python:3.12-rc-alpine3.18
+python:3.12-rc-bookworm
 python:3.12-rc-bullseye
-python:3.12-rc-buster
 python:3.12-rc-slim
+python:3.12-rc-slim-bookworm
 python:3.12-rc-slim-bullseye
-python:3.12-rc-slim-buster
 python:3.12-rc-windowsservercore
 python:3.12-rc-windowsservercore-1809
 python:3.12-rc-windowsservercore-ltsc2022
@@ -122,23 +122,23 @@ python:3.12.0b2
 python:3.12.0b2-alpine
 python:3.12.0b2-alpine3.17
 python:3.12.0b2-alpine3.18
+python:3.12.0b2-bookworm
 python:3.12.0b2-bullseye
-python:3.12.0b2-buster
 python:3.12.0b2-slim
+python:3.12.0b2-slim-bookworm
 python:3.12.0b2-slim-bullseye
-python:3.12.0b2-slim-buster
 python:3.12.0b2-windowsservercore
 python:3.12.0b2-windowsservercore-1809
 python:3.12.0b2-windowsservercore-ltsc2022
 python:alpine
 python:alpine3.17
 python:alpine3.18
+python:bookworm
 python:bullseye
-python:buster
 python:latest
 python:slim
+python:slim-bookworm
 python:slim-bullseye
-python:slim-buster
 python:windowsservercore
 python:windowsservercore-1809
 python:windowsservercore-ltsc2022
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 2c118ca..bc670d8 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,40 +1,40 @@
 python:3.7-alpine3.17
 python:3.7-alpine
+python:3.7-bookworm
 python:3.7-bullseye
-python:3.7-buster
 python:3.7-slim
-python:3.7-slim-buster
+python:3.7-slim-bullseye
 python:3.8-alpine3.17
 python:3.8-alpine
+python:3.8-bookworm
 python:3.8-bullseye
-python:3.8-buster
 python:3.8-slim
-python:3.8-slim-buster
+python:3.8-slim-bullseye
 python:3.9-alpine3.17
 python:3.9-alpine
+python:3.9-bookworm
 python:3.9-bullseye
-python:3.9-buster
 python:3.9-slim
-python:3.9-slim-buster
+python:3.9-slim-bullseye
 python:3.10-alpine3.17
 python:3.10-alpine
+python:3.10-bookworm
 python:3.10-bullseye
-python:3.10-buster
 python:3.10-slim
-python:3.10-slim-buster
+python:3.10-slim-bullseye
 python:alpine3.17
 python:alpine
+python:bookworm
 python:bullseye
-python:buster
 python:slim
-python:slim-buster
+python:slim-bullseye
 python:windowsservercore-1809
 python:windowsservercore-ltsc2022
 python:3.12-rc-alpine3.17
 python:3.12-rc-alpine
+python:3.12-rc-bookworm
 python:3.12-rc-bullseye
-python:3.12-rc-buster
 python:3.12-rc-slim
-python:3.12-rc-slim-buster
+python:3.12-rc-slim-bullseye
 python:3.12-rc-windowsservercore-1809
 python:3.12-rc-windowsservercore-ltsc2022
diff --git a/python_3.10-buster/Dockerfile b/python_3.10-bookworm/Dockerfile
similarity index 99%
rename from python_3.10-buster/Dockerfile
rename to python_3.10-bookworm/Dockerfile
index a059b29..94261b6 100644
--- a/python_3.10-buster/Dockerfile
+++ b/python_3.10-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:buster
+FROM buildpack-deps:bookworm
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/python_3.10-slim-buster/Dockerfile b/python_3.10-slim-bullseye/Dockerfile
similarity index 97%
rename from python_3.10-slim-buster/Dockerfile
rename to python_3.10-slim-bullseye/Dockerfile
index ce4baa5..31f2aed 100644
--- a/python_3.10-slim-buster/Dockerfile
+++ b/python_3.10-slim-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
@@ -112,7 +112,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -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/python_3.10-slim/Dockerfile b/python_3.10-slim/Dockerfile
index b44d3f4..403a652 100644
--- a/python_3.10-slim/Dockerfile
+++ b/python_3.10-slim/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
@@ -112,7 +112,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -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/python_3.12-rc-buster/Dockerfile b/python_3.12-rc-bookworm/Dockerfile
similarity index 99%
rename from python_3.12-rc-buster/Dockerfile
rename to python_3.12-rc-bookworm/Dockerfile
index f4edf0f..ab67f9c 100644
--- a/python_3.12-rc-buster/Dockerfile
+++ b/python_3.12-rc-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:buster
+FROM buildpack-deps:bookworm
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/python_3.12-rc-slim-buster/Dockerfile b/python_3.12-rc-slim-bullseye/Dockerfile
similarity index 97%
rename from python_3.12-rc-slim-buster/Dockerfile
rename to python_3.12-rc-slim-bullseye/Dockerfile
index 49c0f44..f295f21 100644
--- a/python_3.12-rc-slim-buster/Dockerfile
+++ b/python_3.12-rc-slim-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
@@ -112,7 +112,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -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/python_3.12-rc-slim/Dockerfile b/python_3.12-rc-slim/Dockerfile
index 829d46d..10fa77c 100644
--- a/python_3.12-rc-slim/Dockerfile
+++ b/python_3.12-rc-slim/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
@@ -112,7 +112,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -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/python_3.7-buster/Dockerfile b/python_3.7-bookworm/Dockerfile
similarity index 99%
rename from python_3.7-buster/Dockerfile
rename to python_3.7-bookworm/Dockerfile
index 6067745..e693852 100644
--- a/python_3.7-buster/Dockerfile
+++ b/python_3.7-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:buster
+FROM buildpack-deps:bookworm
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/python_3.7-slim-buster/Dockerfile b/python_3.7-slim-bullseye/Dockerfile
similarity index 97%
rename from python_3.7-slim-buster/Dockerfile
rename to python_3.7-slim-bullseye/Dockerfile
index dc9cd90..8558552 100644
--- a/python_3.7-slim-buster/Dockerfile
+++ b/python_3.7-slim-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
@@ -148,7 +148,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -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/python_3.7-slim/Dockerfile b/python_3.7-slim/Dockerfile
index dced8d1..8e12336 100644
--- a/python_3.7-slim/Dockerfile
+++ b/python_3.7-slim/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
@@ -148,7 +148,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -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/python_3.8-buster/Dockerfile b/python_3.8-bookworm/Dockerfile
similarity index 99%
rename from python_3.8-buster/Dockerfile
rename to python_3.8-bookworm/Dockerfile
index d535424..dc45af9 100644
--- a/python_3.8-buster/Dockerfile
+++ b/python_3.8-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:buster
+FROM buildpack-deps:bookworm
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/python_3.8-slim-buster/Dockerfile b/python_3.8-slim-bullseye/Dockerfile
similarity index 97%
rename from python_3.8-slim-buster/Dockerfile
rename to python_3.8-slim-bullseye/Dockerfile
index 820963c..00f197f 100644
--- a/python_3.8-slim-buster/Dockerfile
+++ b/python_3.8-slim-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
@@ -112,7 +112,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -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/python_3.8-slim/Dockerfile b/python_3.8-slim/Dockerfile
index 8d3478b..64204b9 100644
--- a/python_3.8-slim/Dockerfile
+++ b/python_3.8-slim/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
@@ -112,7 +112,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -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/python_3.9-buster/Dockerfile b/python_3.9-bookworm/Dockerfile
similarity index 99%
rename from python_3.9-buster/Dockerfile
rename to python_3.9-bookworm/Dockerfile
index d17101b..a07f259 100644
--- a/python_3.9-buster/Dockerfile
+++ b/python_3.9-bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:buster
+FROM buildpack-deps:bookworm
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/python_3.9-slim-buster/Dockerfile b/python_3.9-slim-bullseye/Dockerfile
similarity index 97%
rename from python_3.9-slim-buster/Dockerfile
rename to python_3.9-slim-bullseye/Dockerfile
index f9ac003..d6f43ce 100644
--- a/python_3.9-slim-buster/Dockerfile
+++ b/python_3.9-slim-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
@@ -111,7 +111,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -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/python_3.9-slim/Dockerfile b/python_3.9-slim/Dockerfile
index 1723971..90720c1 100644
--- a/python_3.9-slim/Dockerfile
+++ b/python_3.9-slim/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
@@ -111,7 +111,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -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/python_buster/Dockerfile b/python_bookworm/Dockerfile
similarity index 99%
rename from python_buster/Dockerfile
rename to python_bookworm/Dockerfile
index 8c516c2..6333cf0 100644
--- a/python_buster/Dockerfile
+++ b/python_bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:buster
+FROM buildpack-deps:bookworm
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/python_slim-buster/Dockerfile b/python_slim-bullseye/Dockerfile
similarity index 97%
rename from python_slim-buster/Dockerfile
rename to python_slim-bullseye/Dockerfile
index 16f2567..16a5b4e 100644
--- a/python_slim-buster/Dockerfile
+++ b/python_slim-bullseye/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
@@ -112,7 +112,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -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/python_slim/Dockerfile b/python_slim/Dockerfile
index 3051c98..3eafbd3 100644
--- a/python_slim/Dockerfile
+++ b/python_slim/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
@@ -112,7 +112,7 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	find /usr/local -type f -executable -not \( -name '*tkinter*' \) -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:

@yosifkit yosifkit merged commit 69682cd into docker-library:master Jun 14, 2023
45 checks passed
@yosifkit yosifkit deleted the python branch June 14, 2023 17: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.

None yet

3 participants