8000 add bookworm, remove buster · oddch/python@5d908b0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5d908b0

Browse files
sspans-sbptianon
sspans-sbp
authored and
tianon
committed
add bookworm, remove buster
1 parent b744d97 commit 5d908b0

File tree

21 files changed

+43
-40
lines changed

21 files changed

+43
-40
lines changed

‎3.10/buster/Dockerfile renamed to ‎3.10/bookworm/Dockerfile

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

‎3.10/slim-buster/Dockerfile renamed to ‎3.10/slim-bookworm/Dockerfile

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

‎3.10/slim-bullseye/Dockerfile

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

‎3.11/buster/Dockerfile renamed to ‎3.11/bookworm/Dockerfile

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

‎3.11/slim-buster/Dockerfile renamed to ‎3.11/slim-bookworm/Dockerfile

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

‎3.11/slim-bullseye/Dockerfile

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

‎3.12-rc/buster/Dockerfile renamed to ‎3.12-rc/bookworm/Dockerfile

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

‎3.12-rc/slim-buster/Dockerfile renamed to ‎3.12-rc/slim-bookworm/Dockerfile

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

‎3.12-rc/slim-bullseye/Dockerfile

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

‎3.7/buster/Dockerfile renamed to ‎3.7/bookworm/Dockerfile

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

‎3.7/slim-buster/Dockerfile renamed to ‎3.7/slim-bookworm/Dockerfile

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

‎3.7/slim-bullseye/Dockerfile

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

‎3.8/buster/Dockerfile renamed to ‎3.8/bookworm/Dockerfile

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

‎3.8/slim-buster/Dockerfile renamed to ‎3.8/slim-bookworm/Dockerfile

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

‎3.8/slim-bullseye/Dockerfile

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

‎3.9/buster/Dockerfile renamed to ‎3.9/bookworm/Dockerfile

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

‎3.9/slim-buster/Dockerfile renamed to ‎3.9/slim-bookworm/Dockerfile

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

‎3.9/slim-bullseye/Dockerfile

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

‎Dockerfile-linux.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ end
281281
apt-mark auto '.*' > /dev/null; \
282282
apt-mark manual $savedAptMark; \
283283
find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
284-
| awk '/=>/ { print $(NF-1) }' \
284+
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
285285
| sort -u \
286286
| xargs -r dpkg-query --search \
287287
| cut -d: -f1 \

‎versions.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"version": "65.5.1"
1010
},
1111
"variants": [
12+
"bookworm",
13+
"slim-bookworm",
1214
"bullseye",
1315
"slim-bullseye",
14-
"buster",
15-
"slim-buster",
1616
"alpine3.18",
1717
"alpine3.17"
1818
],
@@ -28,10 +28,10 @@
2828
"version": "65.5.1"
2929
},
3030
"variants": [
31+
"bookworm",
32+
"slim-bookworm",
3133
"bullseye",
3234
"slim-bullseye",
33-
"buster",
34-
"slim-buster",
3535
"alpine3.18",
3636
"alpine3.17",
3737
"windows/windowsservercore-ltsc2022",
@@ -46,10 +46,10 @@
4646
"version": "23.1.2"
4747
},
4848
"variants": [
49+
"bookworm",
50+
"slim-bookworm",
4951
"bullseye",
5052
"slim-bullseye",
51-
"buster",
52-
"slim-buster",
5353
"alpine3.18",
5454
"alpine3.17",
5555
"windows/windowsservercore-ltsc2022",
@@ -67,10 +67,10 @@
6767
"version": "57.5.0"
6868
},
6969
"variants": [
70+
"bookworm",
71+
"slim-bookworm",
7072
"bullseye",
7173
"slim-bullseye",
72-
"buster",
73-
"slim-buster",
7474
"alpine3.18",
7575
"alpine3.17"
7676
],
@@ -86,10 +86,10 @@
8686
"version": "57.5.0"
8787
},
8888
"variants": [
89+
"bookworm",
90+
"slim-bookworm",
8991
"bullseye",
9092
"slim-bullseye",
91-
"buster",
92-
"slim-buster",
9393
"alpine3.18",
9494
"alpine3.17"
9595
],
@@ -105,10 +105,10 @@
105105
"version": "58.1.0"
106106
},
107107
"variants": [
108+
"bookworm",
109+
"slim-bookworm",
108110
"bullseye",
109111
"slim-bullseye",
110-
"buster",
111-
"slim-buster",
112112
"alpine3.18",
113113
"alpine3.17"
114114
],

‎versions.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,17 +184,20 @@ for version in "${versions[@]}"; do
184184
},
185185
variants: [
186186
(
187+
"bookworm",
187188
"bullseye",
188-
"buster"
189+
empty
189190
| ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893
190191
(
191192
"3.18",
192-
"3.17"
193+
"3.17",
194+
empty
193195
| "alpine" + .),
194196
if env.hasWindows != "" then
195197
(
196198
"ltsc2022",
197-
"1809"
199+
"1809",
200+
empty
198201
| "windows/windowsservercore-" + .)
199202
else empty end
200203
],

0 commit comments

Comments
 (0)
0