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 #16810

Merged
merged 1 commit into from
May 22, 2024
Merged

Update python #16810

merged 1 commit into from
May 22, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented May 22, 2024

Changes:

Changes:

- docker-library/python@cfaa0c0: Merge pull request docker-library/python#925 from jnoordsij/add-alpine-3.20
- docker-library/python@f93fe0b: Add Alpine 3.20 and drop 3.18
@tianon tianon requested a review from a team as a code owner May 22, 2024 20:40
Copy link

Diff for 2875d5d:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 43c9140..ae2b359 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -6,5 +6,6 @@ arm64v8
 i386
 mips64le
 ppc64le
+riscv64
 s390x
 windows-amd64
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 376eba2..0841c91 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,16 +2,16 @@ Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosi
 GitRepo: https://github.com/docker-library/python.git
 Builder: buildkit
 
-Tags: 3.8.19-alpine3.18, 3.8-alpine3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1b7a1106674a21e699b155cbd53bf39387284cca
-Directory: 3.8/alpine3.18
-
-Tags: 3.8.19-alpine3.19, 3.8-alpine3.19, 3.8.19-alpine, 3.8-alpine
+Tags: 3.8.19-alpine3.19, 3.8-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 1b7a1106674a21e699b155cbd53bf39387284cca
 Directory: 3.8/alpine3.19
 
+Tags: 3.8.19-alpine3.20, 3.8-alpine3.20, 3.8.19-alpine, 3.8-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: f93fe0bd5c6649cc821ab7f8e959a322054fe798
+Directory: 3.8/alpine3.20
+
 Tags: 3.8.19-bookworm, 3.8-bookworm
 SharedTags: 3.8.19, 3.8
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -33,16 +33,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 1b7a1106674a21e699b155cbd53bf39387284cca
 Directory: 3.8/slim-bullseye
 
-Tags: 3.9.19-alpine3.18, 3.9-alpine3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1b7a1106674a21e699b155cbd53bf39387284cca
-Directory: 3.9/alpine3.18
-
-Tags: 3.9.19-alpine3.19, 3.9-alpine3.19, 3.9.19-alpine, 3.9-alpine
+Tags: 3.9.19-alpine3.19, 3.9-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 1b7a1106674a21e699b155cbd53bf39387284cca
 Directory: 3.9/alpine3.19
 
+Tags: 3.9.19-alpine3.20, 3.9-alpine3.20, 3.9.19-alpine, 3.9-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: f93fe0bd5c6649cc821ab7f8e959a322054fe798
+Directory: 3.9/alpine3.20
+
 Tags: 3.9.19-bookworm, 3.9-bookworm
 SharedTags: 3.9.19, 3.9
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -64,16 +64,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
 GitCommit: 1b7a1106674a21e699b155cbd53bf39387284cca
 Directory: 3.9/slim-bullseye
 
-Tags: 3.10.14-alpine3.18, 3.10-alpine3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 1b7a1106674a21e699b155cbd53bf39387284cca
-Directory: 3.10/alpine3.18
-
-Tags: 3.10.14-alpine3.19, 3.10-alpine3.19, 3.10.14-alpine, 3.10-alpine
+Tags: 3.10.14-alpine3.19, 3.10-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 1b7a1106674a21e699b155cbd53bf39387284cca
 Directory: 3.10/alpine3.19
 
+Tags: 3.10.14-alpine3.20, 3.10-alpine3.20, 3.10.14-alpine, 3.10-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: f93fe0bd5c6649cc821ab7f8e959a322054fe798
+Directory: 3.10/alpine3.20
+
 Tags: 3.10.14-bookworm, 3.10-bookworm
 SharedTags: 3.10.14, 3.10
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -95,16 +95,16 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 1b7a1106674a21e699b155cbd53bf39387284cca
 Directory: 3.10/slim-bullseye
 
-Tags: 3.11.9-alpine3.18, 3.11-alpine3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 89b2500cd1255b1be5f57c1bce598f031172bb0a
-Directory: 3.11/alpine3.18
-
-Tags: 3.11.9-alpine3.19, 3.11-alpine3.19, 3.11.9-alpine, 3.11-alpine
+Tags: 3.11.9-alpine3.19, 3.11-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 89b2500cd1255b1be5f57c1bce598f031172bb0a
 Directory: 3.11/alpine3.19
 
+Tags: 3.11.9-alpine3.20, 3.11-alpine3.20, 3.11.9-alpine, 3.11-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: f93fe0bd5c6649cc821ab7f8e959a322054fe798
+Directory: 3.11/alpine3.20
+
 Tags: 3.11.9-bookworm, 3.11-bookworm
 SharedTags: 3.11.9, 3.11
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -142,16 +142,16 @@ Directory: 3.11/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 3.12.3-alpine3.18, 3.12-alpine3.18, 3-alpine3.18, alpine3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: bf5951cfa2b2f6c3dabf428549c9dca658ecee81
-Directory: 3.12/alpine3.18
-
-Tags: 3.12.3-alpine3.19, 3.12-alpine3.19, 3-alpine3.19, alpine3.19, 3.12.3-alpine, 3.12-alpine, 3-alpine, alpine
+Tags: 3.12.3-alpine3.19, 3.12-alpine3.19, 3-alpine3.19, alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: bf5951cfa2b2f6c3dabf428549c9dca658ecee81
 Directory: 3.12/alpine3.19
 
+Tags: 3.12.3-alpine3.20, 3.12-alpine3.20, 3-alpine3.20, alpine3.20, 3.12.3-alpine, 3.12-alpine, 3-alpine, alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: f93fe0bd5c6649cc821ab7f8e959a322054fe798
+Directory: 3.12/alpine3.20
+
 Tags: 3.12.3-bookworm, 3.12-bookworm, 3-bookworm, bookworm
 SharedTags: 3.12.3, 3.12, 3, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
@@ -189,16 +189,16 @@ Directory: 3.12/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 3.13.0b1-alpine3.18, 3.13-rc-alpine3.18
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 875ce40a1ae98c7c37b1652e65f76376ac93a911
-Directory: 3.13-rc/alpine3.18
-
-Tags: 3.13.0b1-alpine3.19, 3.13-rc-alpine3.19, 3.13.0b1-alpine, 3.13-rc-alpine
+Tags: 3.13.0b1-alpine3.19, 3.13-rc-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 875ce40a1ae98c7c37b1652e65f76376ac93a911
 Directory: 3.13-rc/alpine3.19
 
+Tags: 3.13.0b1-alpine3.20, 3.13-rc-alpine3.20, 3.13.0b1-alpine, 3.13-rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: f93fe0bd5c6649cc821ab7f8e959a322054fe798
+Directory: 3.13-rc/alpine3.20
+
 Tags: 3.13.0b1-bookworm, 3.13-rc-bookworm
 SharedTags: 3.13.0b1, 3.13-rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
diff --git a/_bashbrew-list b/_bashbrew-list
index 1dd07f4..f13dce5 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
 python:3
 python:3-alpine
-python:3-alpine3.18
 python:3-alpine3.19
+python:3-alpine3.20
 python:3-bookworm
 python:3-bullseye
 python:3-slim
@@ -12,8 +12,8 @@ python:3-windowsservercore-1809
 python:3-windowsservercore-ltsc2022
 python:3.8
 python:3.8-alpine
-python:3.8-alpine3.18
 python:3.8-alpine3.19
+python:3.8-alpine3.20
 python:3.8-bookworm
 python:3.8-bullseye
 python:3.8-slim
@@ -21,8 +21,8 @@ python:3.8-slim-bookworm
 python:3.8-slim-bullseye
 python:3.8.19
 python:3.8.19-alpine
-python:3.8.19-alpine3.18
 python:3.8.19-alpine3.19
+python:3.8.19-alpine3.20
 python:3.8.19-bookworm
 python:3.8.19-bullseye
 python:3.8.19-slim
@@ -30,8 +30,8 @@ python:3.8.19-slim-bookworm
 python:3.8.19-slim-bullseye
 python:3.9
 python:3.9-alpine
-python:3.9-alpine3.18
 python:3.9-alpine3.19
+python:3.9-alpine3.20
 python:3.9-bookworm
 python:3.9-bullseye
 python:3.9-slim
@@ -39,8 +39,8 @@ python:3.9-slim-bookworm
 python:3.9-slim-bullseye
 python:3.9.19
 python:3.9.19-alpine
-python:3.9.19-alpine3.18
 python:3.9.19-alpine3.19
+python:3.9.19-alpine3.20
 python:3.9.19-bookworm
 python:3.9.19-bullseye
 python:3.9.19-slim
@@ -48,8 +48,8 @@ python:3.9.19-slim-bookworm
 python:3.9.19-slim-bullseye
 python:3.10
 python:3.10-alpine
-python:3.10-alpine3.18
 python:3.10-alpine3.19
+python:3.10-alpine3.20
 python:3.10-bookworm
 python:3.10-bullseye
 python:3.10-slim
@@ -57,8 +57,8 @@ python:3.10-slim-bookworm
 python:3.10-slim-bullseye
 python:3.10.14
 python:3.10.14-alpine
-python:3.10.14-alpine3.18
 python:3.10.14-alpine3.19
+python:3.10.14-alpine3.20
 python:3.10.14-bookworm
 python:3.10.14-bullseye
 python:3.10.14-slim
@@ -66,8 +66,8 @@ python:3.10.14-slim-bookworm
 python:3.10.14-slim-bullseye
 python:3.11
 python:3.11-alpine
-python:3.11-alpine3.18
 python:3.11-alpine3.19
+python:3.11-alpine3.20
 python:3.11-bookworm
 python:3.11-bullseye
 python:3.11-slim
@@ -78,8 +78,8 @@ python:3.11-windowsservercore-1809
 python:3.11-windowsservercore-ltsc2022
 python:3.11.9
 python:3.11.9-alpine
-python:3.11.9-alpine3.18
 python:3.11.9-alpine3.19
+python:3.11.9-alpine3.20
 python:3.11.9-bookworm
 python:3.11.9-bullseye
 python:3.11.9-slim
@@ -90,8 +90,8 @@ python:3.11.9-windowsservercore-1809
 python:3.11.9-windowsservercore-ltsc2022
 python:3.12
 python:3.12-alpine
-python:3.12-alpine3.18
 python:3.12-alpine3.19
+python:3.12-alpine3.20
 python:3.12-bookworm
 python:3.12-bullseye
 python:3.12-slim
@@ -102,8 +102,8 @@ python:3.12-windowsservercore-1809
 python:3.12-windowsservercore-ltsc2022
 python:3.12.3
 python:3.12.3-alpine
-python:3.12.3-alpine3.18
 python:3.12.3-alpine3.19
+python:3.12.3-alpine3.20
 python:3.12.3-bookworm
 python:3.12.3-bullseye
 python:3.12.3-slim
@@ -114,8 +114,8 @@ python:3.12.3-windowsservercore-1809
 python:3.12.3-windowsservercore-ltsc2022
 python:3.13-rc
 python:3.13-rc-alpine
-python:3.13-rc-alpine3.18
 python:3.13-rc-alpine3.19
+python:3.13-rc-alpine3.20
 python:3.13-rc-bookworm
 python:3.13-rc-bullseye
 python:3.13-rc-slim
@@ -126,8 +126,8 @@ python:3.13-rc-windowsservercore-1809
 python:3.13-rc-windowsservercore-ltsc2022
 python:3.13.0b1
 python:3.13.0b1-alpine
-python:3.13.0b1-alpine3.18
 python:3.13.0b1-alpine3.19
+python:3.13.0b1-alpine3.20
 python:3.13.0b1-bookworm
 python:3.13.0b1-bullseye
 python:3.13.0b1-slim
@@ -137,8 +137,8 @@ python:3.13.0b1-windowsservercore
 python:3.13.0b1-windowsservercore-1809
 python:3.13.0b1-windowsservercore-ltsc2022
 python:alpine
-python:alpine3.18
 python:alpine3.19
+python:alpine3.20
 python:bookworm
 python:bullseye
 python:latest
diff --git a/python_3.10-alpine/Dockerfile b/python_3.10-alpine/Dockerfile
index bd3ebc8..6a97864 100644
--- a/python_3.10-alpine/Dockerfile
+++ b/python_3.10-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/python_3.10-alpine3.18/Dockerfile b/python_3.10-alpine3.18/Dockerfile
deleted file mode 100644
index ea964d6..0000000
diff --git a/python_3.10-alpine/Dockerfile b/python_3.10-alpine3.19/Dockerfile
similarity index 100%
copy from python_3.10-alpine/Dockerfile
copy to python_3.10-alpine3.19/Dockerfile
diff --git a/python_3.11-alpine/Dockerfile b/python_3.11-alpine/Dockerfile
index 56c4811..287a21d 100644
--- a/python_3.11-alpine/Dockerfile
+++ b/python_3.11-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/python_3.11-alpine3.18/Dockerfile b/python_3.11-alpine3.18/Dockerfile
deleted file mode 100644
index 81e50ff..0000000
diff --git a/python_3.11-alpine/Dockerfile b/python_3.11-alpine3.19/Dockerfile
similarity index 100%
copy from python_3.11-alpine/Dockerfile
copy to python_3.11-alpine3.19/Dockerfile
diff --git a/python_3.13-rc-alpine/Dockerfile b/python_3.13-rc-alpine/Dockerfile
index 3ba6066..fffad81 100644
--- a/python_3.13-rc-alpine/Dockerfile
+++ b/python_3.13-rc-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/python_3.13-rc-alpine3.18/Dockerfile b/python_3.13-rc-alpine3.18/Dockerfile
deleted file mode 100644
index e1127d5..0000000
diff --git a/python_3.13-rc-alpine/Dockerfile b/python_3.13-rc-alpine3.19/Dockerfile
similarity index 100%
copy from python_3.13-rc-alpine/Dockerfile
copy to python_3.13-rc-alpine3.19/Dockerfile
diff --git a/python_3.8-alpine/Dockerfile b/python_3.8-alpine/Dockerfile
index 3e2a01a..38b0448 100644
--- a/python_3.8-alpine/Dockerfile
+++ b/python_3.8-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/python_3.8-alpine3.18/Dockerfile b/python_3.8-alpine3.18/Dockerfile
deleted file mode 100644
index 68acefc..0000000
diff --git a/python_3.8-alpine/Dockerfile b/python_3.8-alpine3.19/Dockerfile
similarity index 100%
copy from python_3.8-alpine/Dockerfile
copy to python_3.8-alpine3.19/Dockerfile
diff --git a/python_3.9-alpine/Dockerfile b/python_3.9-alpine/Dockerfile
index 2497a45..5366982 100644
--- a/python_3.9-alpine/Dockerfile
+++ b/python_3.9-alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/python_3.9-alpine3.18/Dockerfile b/python_3.9-alpine3.18/Dockerfile
deleted file mode 100644
index 113869c..0000000
diff --git a/python_3.9-alpine/Dockerfile b/python_3.9-alpine3.19/Dockerfile
similarity index 100%
copy from python_3.9-alpine/Dockerfile
copy to python_3.9-alpine3.19/Dockerfile
diff --git a/python_alpine/Dockerfile b/python_alpine/Dockerfile
index 46426a7..a73e498 100644
--- a/python_alpine/Dockerfile
+++ b/python_alpine/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.19
+FROM alpine:3.20
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
diff --git a/python_alpine3.18/Dockerfile b/python_alpine3.18/Dockerfile
deleted file mode 100644
index bb7f568..0000000
diff --git a/python_alpine/Dockerfile b/python_alpine3.19/Dockerfile
similarity index 100%
copy from python_alpine/Dockerfile
copy to python_alpine3.19/Dockerfile

Relevant Maintainers:

@yosifkit yosifkit merged commit 35f623b into docker-library:master May 22, 2024
47 checks passed
@yosifkit yosifkit deleted the python branch May 22, 2024 22:19
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.

3 participants