8000 Merge pull request #456 from sitano/ivan_golang_bookworm · Abhicodeitout/golang@db757a0 · GitHub
[go: up one dir, main page]
Skip to content

Commit db757a0

Browse files
tianontianon
authored
Merge pull request docker-library#456 from sitano/ivan_golang_bookworm
Add debian:bookworm distro for 1.20 and 1.19
2 parents 29b2d53 + cd60713 commit db757a0

File tree

5 files changed

+8
-14
lines changed

5 files changed

+8
-14
lines changed

‎1.19/buster/Dockerfile renamed to ‎1.19/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.

‎1.20/buster/Dockerfile renamed to ‎1.20/bookworm/Dockerfile

Lines changed: 3 additions & 9 deletions
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
@@ -131,7 +131,7 @@ RUN set -eux; \
131131
; \
132132
{{ ) else ( -}}
133133
savedAptMark="$(apt-mark showmanual)"; \
134-
{{ if [ "1.19" ] | index(env.version) then ( -}}
134+
{{ if [ "1.19" ] | index(env.version) or env.variant != "bullseye" then ( -}}
135135
apt-get update; \
136136
apt-get install -y --no-install-recommends golang-go; \
137137
{{ ) else ( -}}

‎versions.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@
153153
}
154154
},
155155
"variants": [
156+
"bookworm",
156157
"bullseye",
157-
"buster",
158158
"alpine3.18",
159159
"alpine3.17",
160160
"windows/windowsservercore-ltsc2022",
@@ -318,8 +318,8 @@
318318
}
319319
},
320320
"variants": [
321+
"bookworm",
321322
"bullseye",
322-
"buster",
323323
"alpine3.18",
324324
"alpine3.17",
325325
"windows/windowsservercore-ltsc2022",

‎versions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ for version in "${versions[@]}"; do
143143
version: .version,
144144
arches: .arches,
145145
variants: [
146+
"bookworm",
146147
"bullseye",
147-
"buster",
148148
(
149149
"3.18",
150150
"3.17"

0 commit comments

Comments
 (0)
0