From cf90acdd6a92c4e20c68312209e0764a96758d2c Mon Sep 17 00:00:00 2001
From: Joseph Ferguson <yosifkit@gmail.com>
Date: Tue, 13 Jun 2023 13:54:20 -0700
Subject: [PATCH] Add Debian bookworm, drop buster

---
 1.6/{buster => bookworm}/Dockerfile           | 2 +-
 1.6/{buster => bookworm}/docker-entrypoint.sh | 0
 1.9/{buster => bookworm}/Dockerfile           | 2 +-
 1.9/{buster => bookworm}/docker-entrypoint.sh | 0
 apply-templates.sh                            | 2 +-
 versions.json                                 | 4 ++--
 versions.sh                                   | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename 1.6/{buster => bookworm}/Dockerfile (99%)
 rename 1.6/{buster => bookworm}/docker-entrypoint.sh (100%)
 rename 1.9/{buster => bookworm}/Dockerfile (99%)
 rename 1.9/{buster => bookworm}/docker-entrypoint.sh (100%)

diff --git a/1.6/buster/Dockerfile b/1.6/bookworm/Dockerfile
similarity index 99%
rename from 1.6/buster/Dockerfile
rename to 1.6/bookworm/Dockerfile
index 4576464..ecfc53c 100644
--- a/1.6/buster/Dockerfile
+++ b/1.6/bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:buster-slim
+FROM debian:bookworm-slim
 
 RUN set -eux; \
 	apt-get update; \
diff --git a/1.6/buster/docker-entrypoint.sh b/1.6/bookworm/docker-entrypoint.sh
similarity index 100%
rename from 1.6/buster/docker-entrypoint.sh
rename to 1.6/bookworm/docker-entrypoint.sh
diff --git a/1.9/buster/Dockerfile b/1.9/bookworm/Dockerfile
similarity index 99%
rename from 1.9/buster/Dockerfile
rename to 1.9/bookworm/Dockerfile
index 1f65059..95de3e9 100644
--- a/1.9/buster/Dockerfile
+++ b/1.9/bookworm/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:buster-slim
+FROM debian:bookworm-slim
 
 RUN set -eux; \
 	apt-get update; \
diff --git a/1.9/buster/docker-entrypoint.sh b/1.9/bookworm/docker-entrypoint.sh
similarity index 100%
rename from 1.9/buster/docker-entrypoint.sh
rename to 1.9/bookworm/docker-entrypoint.sh
diff --git a/apply-templates.sh b/apply-templates.sh
index 412ff94..78b7291 100755
--- a/apply-templates.sh
+++ b/apply-templates.sh
@@ -38,7 +38,7 @@ for version; do
 	for dir in "${variants[@]}"; do
 		mkdir -p "$version/$dir"
 
-		variant="$(basename "$dir")" # "buster", "windowsservercore-1809", etc
+		variant="$(basename "$dir")" # "bookworm", "windowsservercore-1809", etc
 		export variant
 
 		case "$dir" in
diff --git a/versions.json b/versions.json
index 477efcb..c800c33 100644
--- a/versions.json
+++ b/versions.json
@@ -39,8 +39,8 @@
       }
     },
     "variants": [
+      "bookworm",
       "bullseye",
-      "buster",
       "alpine3.18",
       "alpine3.17",
       "windows/windowsservercore-ltsc2022",
@@ -92,8 +92,8 @@
       }
     },
     "variants": [
+      "bookworm",
       "bullseye",
-      "buster",
       "alpine3.18",
       "alpine3.17",
       "windows/windowsservercore-ltsc2022",
diff --git a/versions.sh b/versions.sh
index 7751a8a..fc24956 100755
--- a/versions.sh
+++ b/versions.sh
@@ -88,8 +88,8 @@ for version in "${versions[@]}"; do
 		$doc
 		| del(.major)
 		| .variants = ([
+			"bookworm",
 			"bullseye",
-			"buster",
 			if .arches | keys | any(startswith("alpine-")) then
 				"3.18",
 				"3.17"