From 5f39e93d90f3f147422429b482dffc6a63ec2317 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Fri, 14 Oct 2022 14:33:54 +1100
Subject: [PATCH] 10.11 MARIADB_MAJOR not removed

---
 10.11/Dockerfile |  6 ++----
 update.sh        | 18 +++++++++---------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/10.11/Dockerfile b/10.11/Dockerfile
index a3703ab..0395fa8 100644
--- a/10.11/Dockerfile
+++ b/10.11/Dockerfile
@@ -71,8 +71,6 @@ RUN set -ex; \
 	apt-key list
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_MAJOR=10.11
-ENV MARIADB_MAJOR $MARIADB_MAJOR
 ARG MARIADB_VERSION=1:10.11.0+maria~ubu2204
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Alpha
@@ -95,8 +93,8 @@ RUN set -e;\
 # also, we set debconf keys to make APT a little quieter
 RUN set -ex; \
 	{ \
-		echo "mariadb-server-$MARIADB_MAJOR" mysql-server/root_password password 'unused'; \
-		echo "mariadb-server-$MARIADB_MAJOR" mysql-server/root_password_again password 'unused'; \
+		echo "mariadb-server" mysql-server/root_password password 'unused'; \
+		echo "mariadb-server" mysql-server/root_password_again password 'unused'; \
 	} | debconf-set-selections; \
 	apt-get update; \
 # mariadb-backup is installed at the same time so that `mysql-common` is only installed once from just mariadb repos
diff --git a/update.sh b/update.sh
index 34c6389..391d846 100755
--- a/update.sh
+++ b/update.sh
@@ -60,14 +60,6 @@ update_version()
 		10.5)
 			sed -i '/backwards compat/d' "$version/Dockerfile"
 			;;
-		10.9 | 10.10)
-			# quoted $ intentional
-			# shellcheck disable=SC2016
-			sed -i -e '/^ARG MARIADB_MAJOR/d' \
-				-e '/^ENV MARIADB_MAJOR/d' \
-				-e 's/-\$MARIADB_MAJOR//' \
-				"$version/Dockerfile"
-			;&
 		*)
 			sed -i -e '/^CMD/s/mysqld/mariadbd/' \
 			       -e '/backwards compat/d' "$version/Dockerfile"
@@ -80,7 +72,15 @@ update_version()
 			       -e 's/mysql_tzinfo_to_sql/mariadb-tzinfo-to-sql/' \
 			       "$version/docker-entrypoint.sh"
 			sed -i -e '0,/#ENDOFSUBSTITUTIONS/s/\bmysql\b/mariadb/' "$version/healthcheck.sh"
-			;;
+			if [[ ! $version =~ 10.[678] ]]; then
+				# quoted $ intentional
+				# shellcheck disable=SC2016
+				sed -i -e '/^ARG MARIADB_MAJOR/d' \
+					-e '/^ENV MARIADB_MAJOR/d' \
+					-e 's/-\$MARIADB_MAJOR//' \
+					"$version/Dockerfile"
+			fi
+			;&
 		esac
 }