Add 13.1 (based on bookworm, soon to be stable) and update other versions to bullseye

Author: tianon

10/Dockerfile

@@ -1,4 +1,4 @@
-FROM buildpack-deps:{{ .debian }}
+FROM buildpack-deps:{{ .debian.version }}
 
 RUN set -ex; \
 	if ! command -v gpg > /dev/null; then \

13/Dockerfile

@@ -2,7 +2,7 @@
 set -Eeuo pipefail
 
 declare -A aliases=(
-	[12]='latest'
+	[13]='latest'
 )
 
 self="$(basename "$BASH_SOURCE")"
@@ -84,7 +84,7 @@ for version; do
 		${aliases[$version]:-}
 	)
 
-	variant="$(jq -r '.[env.version].debian' versions.json)"
+	variant="$(jq -r '.[env.version].debian.version' versions.json)"
 	versionAliases+=( "${versionAliases[@]/%/-$variant}" )
 	versionAliases=( "${versionAliases[@]//latest-/}" )
 

9/Dockerfile

@@ -1,28 +1,45 @@
 {
   "10": {
     "compression": "xz",
-    "debian": "buster",
+    "debian": {
+      "version": "bullseye"
+    },
     "eol": "2023-12-28",
     "lastModified": "2022-06-28",
     "version": "10.4.0"
   },
   "11": {
     "compression": "xz",
-    "debian": "bullseye",
+    "debian": {
+      "version": "bullseye"
+    },
     "eol": "2023-10-21",
     "lastModified": "2022-04-21",
     "version": "11.3.0"
   },
   "12": {
     "compression": "xz",
-    "debian": "bullseye",
+    "debian": {
+      "version": "bullseye"
+    },
     "eol": "2024-02-19",
     "lastModified": "2022-08-19",
     "version": "12.2.0"
   },
+  "13": {
+    "compression": "xz",
+    "debian": {
+      "version": "bookworm"
+    },
+    "eol": "2024-10-26",
+    "lastModified": "2023-04-26",
+    "version": "13.1.0"
+  },
   "9": {
     "compression": "xz",
-    "debian": "buster",
+    "debian": {
+      "version": "bullseye"
+    },
     "eol": "2023-11-27",
     "lastModified": "2022-05-27",
     "version": "9.5.0"

Dockerfile.template

@@ -1,10 +1,9 @@
 #!/bin/bash
 set -Eeuo pipefail
 
-defaultDebianSuite='buster'
+# defaultDebianSuite gets auto-declared below
 declare -A debianSuites=(
-	[11]='bullseye' # https://github.com/docker-library/gcc/pull/74#issuecomment-828768704
-	[12]='bullseye'
+	[13]='bookworm' # TODO after bookworm is actually released, remove this special case
 )
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
@@ -18,6 +17,11 @@ else
 fi
 versions=( "${versions[@]%/}" )
 
+debianStable="$(wget -qO- 'http://deb.debian.org/debian/dists/stable/Release' | grep -F 'Codename:')"
+debianStable="$(awk <<<"$debianStable" '$1 == "Codename:" { print $2; exit }')"
+[ -n "$debianStable" ]
+defaultDebianSuite="$debianStable"
+
 #packagesUrl='https://ftpmirror.gnu.org/gcc/'
 packagesUrl='https://mirrors.kernel.org/gnu/gcc/' # the actual HTML of the page changes based on which mirror we end up hitting, so let's hit a specific one for now... :'(
 packages="$(wget -qO- "$packagesUrl")"
@@ -70,8 +74,10 @@ for version in "${versions[@]}"; do
 			version: env.fullVersion,
 			lastModified: env.lastModified,
 			eol: env.eolDate,
-			debian: env.debianSuite,
 			compression: env.compression,
+			debian: {
+				version: env.debianSuite,
+			},
 		}
 	')"
 done