From 96900fa0e5d9edc95fe35b4f668e844d4193dafd Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Mon, 13 Jun 2022 16:22:06 -0700
Subject: [PATCH] Update 8.0-debian to bullseye

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

diff --git a/8.0/Dockerfile.debian b/8.0/Dockerfile.debian
index e04e5049d..9c5229062 100644
--- a/8.0/Dockerfile.debian
+++ b/8.0/Dockerfile.debian
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:buster-slim
+FROM debian:bullseye-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
@@ -62,9 +62,9 @@ RUN set -eux; \
 	rm -rf "$GNUPGHOME"
 
 ENV MYSQL_MAJOR 8.0
-ENV MYSQL_VERSION 8.0.29-1debian10
+ENV MYSQL_VERSION 8.0.29-1debian11
 
-RUN echo 'deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/ buster 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/ bullseye 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 9fd10c86f..c835e3cbe 100644
--- a/versions.json
+++ b/versions.json
@@ -24,8 +24,8 @@
       "architectures": [
         "amd64"
       ],
-      "suite": "buster",
-      "version": "8.0.29-1debian10"
+      "suite": "bullseye",
+      "version": "8.0.29-1debian11"
     },
     "mysql-shell": {
       "version": "8.0.29-1.el8"
diff --git a/versions.sh b/versions.sh
index 4be42f426..3f8fa0fc6 100755
--- a/versions.sh
+++ b/versions.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-defaultDebianSuite='buster'
+defaultDebianSuite='bullseye'
 declare -A debianSuites=(
-	#[8.0]='stretch'
+	[5.7]='buster'
 )
 
 defaultOracleVariant='8-slim'