Skip to content

Commit 5bb3b30

Browse files
committed
Ditch bookworm for 3.16+, --without-system-libmpdec for 3.15 bookworm
1 parent cba7217 commit 5bb3b30

7 files changed

Lines changed: 13 additions & 284 deletions

File tree

‎3.15/bookworm/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.15/slim-bookworm/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎3.16-rc/bookworm/Dockerfile‎

Lines changed: 0 additions & 131 deletions
This file was deleted.

‎3.16-rc/slim-bookworm/Dockerfile‎

Lines changed: 0 additions & 147 deletions
This file was deleted.

‎Dockerfile-linux.template‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ RUN set -eux; \
154154
if IN(env.version; "3.11", "3.12", "3.13") then empty else
155155
"libzstd-dev"
156156
end,
157-
if IN(env.version; "3.11", "3.12", "3.13", "3.14") then empty else
157+
if IN(env.version; "3.11", "3.12", "3.13", "3.14") then empty elif env.variant | contains("bookworm") then empty else
158158
# https://github.com/docker-library/python/issues/1136
159159
# https://github.com/python/cpython/issues/115119
160160
"libmpdec-dev"
@@ -214,6 +214,10 @@ RUN set -eux; \
214214
{{ # skip LTO on riscv64: https://github.com/docker-library/python/pull/935, https://github.com/docker-library/python/pull/1038 -}}
215215
$(test "${gnuArch%%-*}" != 'riscv64' && echo '--with-lto') \
216216
--with-ensurepip \
217+
{{ if env.version == "3.15" and (env.variant | contains("bookworm")) then ( -}}
218+
# https://github.com/docker-library/python/pull/1137#issuecomment-6180817683
219+
--without-system-libmpdec \
220+
{{ ) else "" end -}}
217221
; \
218222
nproc="$(nproc)"; \
219223
{{ if is_alpine then ( -}}

‎versions.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@
106106
"variants": [
107107
"trixie",
108108
"slim-trixie",
109-
"bookworm",
110-
"slim-bookworm",
111109
"alpine3.24",
112110
"alpine3.23"
113111
],

‎versions.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,10 @@ for version in "${versions[@]}"; do
191191
variants: [
192192
(
193193
"trixie",
194-
"bookworm",
194+
if IN(env.rcVersion; "3.11", "3.12", "3.13", "3.14", "3.15") then
195+
# https://github.com/docker-library/python/pull/1137#issuecomment-6180817683
196+
"bookworm"
197+
else empty end,
195198
empty
196199
| ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893
197200
(

0 commit comments

Comments
 (0)