From d6c12b61316e44e52ce195dd6343ac96e8343fce Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Wed, 28 Feb 2024 13:25:11 -0800
Subject: [PATCH] Update to Debian Bookworm

---
 8.0/Dockerfile.debian | 6 +++---
 versions.json         | 4 ++--
 versions.sh           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/8.0/Dockerfile.debian b/8.0/Dockerfile.debian
index ad0cd3a58..aab9ea589 100644
--- a/8.0/Dockerfile.debian
+++ b/8.0/Dockerfile.debian
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN groupadd -r mysql && useradd -r -g mysql mysql
@@ -66,9 +66,9 @@ RUN set -eux; \
 	rm -rf "$GNUPGHOME"
 
 ENV MYSQL_MAJOR 8.0
-ENV MYSQL_VERSION 8.0.36-1debian11
+ENV MYSQL_VERSION 8.0.36-1debian12
 
-RUN echo 'deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/ bullseye mysql-8.0' > /etc/apt/sources.list.d/mysql.list
+RUN echo 'deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/ bookworm mysql-8.0' > /etc/apt/sources.list.d/mysql.list
 
 # the "/var/lib/mysql" stuff here is because the mysql-server postinst doesn't have an explicit way to disable the mysql_install_db codepath besides having a database already "configured" (ie, stuff in /var/lib/mysql/mysql)
 # also, we set debconf keys to make APT a little quieter
diff --git a/versions.json b/versions.json
index 3532fb3d5..a33359b41 100644
--- a/versions.json
+++ b/versions.json
@@ -4,8 +4,8 @@
       "architectures": [
         "amd64"
       ],
-      "suite": "bullseye",
-      "version": "8.0.36-1debian11"
+      "suite": "bookworm",
+      "version": "8.0.36-1debian12"
     },
     "mysql-shell": {
       "repo": "https://repo.mysql.com/yum/mysql-tools-community/el/8",
diff --git a/versions.sh b/versions.sh
index f8a208849..e285d65c0 100755
--- a/versions.sh
+++ b/versions.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-defaultDebianSuite='bullseye'
+defaultDebianSuite='bookworm'
 declare -A debianSuites=(
 	#[5.7]='buster'
 )