From c252b563a41a6a96f36fb3edee89b109ebdb3204 Mon Sep 17 00:00:00 2001
From: Adrian Manikowski <manikowski@google.com>
Date: Thu, 18 Jan 2024 10:15:23 +0000
Subject: [PATCH] [mysql] Docker images updates - 2024-01-18-101523

---
 5/debian11/5.7/Dockerfile |  6 +++---
 8/debian11/8.0/Dockerfile |  6 +++---
 versions.yaml             | 13 ++++---------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/5/debian11/5.7/Dockerfile b/5/debian11/5.7/Dockerfile
index ae48e5c..6acee49 100644
--- a/5/debian11/5.7/Dockerfile
+++ b/5/debian11/5.7/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install
 
 # add gosu for easy step-down from root
 # https://github.com/tianon/gosu/releases
-ENV GOSU_VERSION 1.16
+ENV GOSU_VERSION 1.14
 RUN set -eux; \
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get --allow-releaseinfo-change update; \
@@ -58,10 +58,10 @@ RUN set -eux; \
 	rm -rf "$GNUPGHOME"
 
 ENV MYSQL_MAJOR 5.7
-ENV MYSQL_VERSION 5.7.42-1debian10
+ENV MYSQL_VERSION 5.7.42-1debian
 ENV C2D_RELEASE 5.7.42
 
-RUN echo "deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/  buster  mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
+RUN echo "deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/    mysql-${MYSQL_MAJOR}" > /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/8/debian11/8.0/Dockerfile b/8/debian11/8.0/Dockerfile
index d360162..cfe6f0d 100644
--- a/8/debian11/8.0/Dockerfile
+++ b/8/debian11/8.0/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get --allow-releaseinfo-change update && apt-get install -y --no-install
 
 # add gosu for easy step-down from root
 # https://github.com/tianon/gosu/releases
-ENV GOSU_VERSION 1.16
+ENV GOSU_VERSION 1.14
 RUN set -eux; \
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get --allow-releaseinfo-change update; \
@@ -58,10 +58,10 @@ RUN set -eux; \
 	rm -rf "$GNUPGHOME"
 
 ENV MYSQL_MAJOR 8.0
-ENV MYSQL_VERSION 8.0.34-1debian11
+ENV MYSQL_VERSION 8.0.34-1debian
 ENV C2D_RELEASE 8.0.34
 
-RUN echo "deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/  bullseye  mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
+RUN echo "deb [ signed-by=/etc/apt/keyrings/mysql.gpg ] http://repo.mysql.com/apt/debian/    mysql-${MYSQL_MAJOR}" > /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.yaml b/versions.yaml
index c9dec24..deb8b89 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ versions:
   packages:
     gosu:
       gpg: B42F6819007F00F88E364FD4036A9C25BF357DD4
-      version: '1.16'
+      version: '1.14'
     mysql:
       gpg: 859BE8D7C586F538430B19C2467B942D3A79BD29
       major: '8.0'
@@ -39,9 +39,6 @@ versions:
   - '8.0'
   - '8'
   - latest
-  templateArgs:
-    distroMajor: '11'
-    distroCodename: bullseye
   templateSubDir: debian11
 - dir: 5/debian11/5.7
   excludeTests:
@@ -50,7 +47,7 @@ versions:
   packages:
     gosu:
       gpg: B42F6819007F00F88E364FD4036A9C25BF357DD4
-      version: '1.16'
+      version: '1.14'
     mysql:
       gpg: 859BE8D7C586F538430B19C2467B942D3A79BD29
       major: '5.7'
@@ -64,9 +61,6 @@ versions:
   - '5.7'
   - '5'
   - latest
-  templateArgs:
-    distroMajor: '10'
-    distroCodename: buster
   templateSubDir: debian11
 - dir: exporter
   excludeTests:
@@ -98,3 +92,4 @@ versions:
   - exporter-0.14
   - exporter-0.14.0
   templateSubDir: exporter
+