Merge pull request #456 from sitano/ivan_golang_bookworm

Add debian:bookworm distro for 1.20 and 1.19
docker-library · Jun 13, 2023 · db757a0 · db757a0
2 parents 29b2d53 + cd60713
commit db757a0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/1.19/buster/Dockerfile → 1.19/bookworm/Dockerfile b/1.19/buster/Dockerfile → 1.19/bookworm/Dockerfile
diff --git a/1.20/buster/Dockerfile → 1.20/bookworm/Dockerfile b/1.20/buster/Dockerfile → 1.20/bookworm/Dockerfile
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
@@ -131,7 +131,7 @@ RUN set -eux; \
 		; \
 {{ ) else ( -}}
 		savedAptMark="$(apt-mark showmanual)"; \
-{{ if [ "1.19" ] | index(env.version) then ( -}}
+{{ if [ "1.19" ] | index(env.version) or env.variant != "bullseye" then ( -}}
 		apt-get update; \
 		apt-get install -y --no-install-recommends golang-go; \
 {{ ) else ( -}}

diff --git a/versions.json b/versions.json
@@ -153,8 +153,8 @@
       }
     },
     "variants": [
+      "bookworm",
       "bullseye",
-      "buster",
       "alpine3.18",
       "alpine3.17",
       "windows/windowsservercore-ltsc2022",
@@ -318,8 +318,8 @@
       }
     },
     "variants": [
+      "bookworm",
       "bullseye",
-      "buster",
       "alpine3.18",
       "alpine3.17",
       "windows/windowsservercore-ltsc2022",

diff --git a/versions.sh b/versions.sh
@@ -143,8 +143,8 @@ for version in "${versions[@]}"; do
 		version: .version,
 		arches: .arches,
 		variants: [
+			"bookworm",
 			"bullseye",
-			"buster",
 			(
 				"3.18",
 				"3.17"