Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mariadb: q3-2022 release #13008

Merged
merged 1 commit into from
Aug 23, 2022
Merged

mariadb: q3-2022 release #13008

merged 1 commit into from
Aug 23, 2022

Conversation

grooverdan
Copy link
Contributor

10.9 is now GA and 10.10 in RC.

10.2 is EOL.

10.9 is now GA and 10.10 in RC.

10.2 is EOL.
@github-actions
Copy link

Diff for e0ddb29:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index bb69725..a911857 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,42 +1,42 @@
 Maintainers: Daniel Black <daniel@mariadb.org> (@grooverdan), Daniel Bartholomew <dbart@mariadb.com> (@dbart)
 GitRepo: https://github.com/MariaDB/mariadb-docker.git
 
-Tags: 10.2.44-bionic, 10.2-bionic, 10.2.44, 10.2
+Tags: 10.3.36-focal, 10.3-focal, 10.3.36, 10.3
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: c0d07be9ad5eb3bc212c6805cc8031308c56e9b6
-Directory: 10.2
-
-Tags: 10.3.35-focal, 10.3-focal, 10.3.35, 10.3
-Architectures: amd64, arm64v8, ppc64le
-GitCommit: c0d07be9ad5eb3bc212c6805cc8031308c56e9b6
+GitCommit: 97e6715fb9f86010de510eef718f7341e3011c25
 Directory: 10.3
 
-Tags: 10.4.25-focal, 10.4-focal, 10.4.25, 10.4
+Tags: 10.4.26-focal, 10.4-focal, 10.4.26, 10.4
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: c0d07be9ad5eb3bc212c6805cc8031308c56e9b6
+GitCommit: 97e6715fb9f86010de510eef718f7341e3011c25
 Directory: 10.4
 
-Tags: 10.5.16-focal, 10.5-focal, 10.5.16, 10.5
+Tags: 10.5.17-focal, 10.5-focal, 10.5.17, 10.5
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: c0d07be9ad5eb3bc212c6805cc8031308c56e9b6
+GitCommit: 97e6715fb9f86010de510eef718f7341e3011c25
 Directory: 10.5
 
-Tags: 10.6.8-focal, 10.6-focal, 10.6.8, 10.6
+Tags: 10.6.9-focal, 10.6-focal, 10.6.9, 10.6
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: c0d07be9ad5eb3bc212c6805cc8031308c56e9b6
+GitCommit: 97e6715fb9f86010de510eef718f7341e3011c25
 Directory: 10.6
 
-Tags: 10.7.4-focal, 10.7-focal, 10.7.4, 10.7
+Tags: 10.7.5-focal, 10.7-focal, 10.7.5, 10.7
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: c6d3396be642bbc73cd14b93e62c615e242f5a0d
+GitCommit: 97e6715fb9f86010de510eef718f7341e3011c25
 Directory: 10.7
 
-Tags: 10.8.3-jammy, 10.8-jammy, 10-jammy, jammy, 10.8.3, 10.8, 10, latest
+Tags: 10.8.4-jammy, 10.8-jammy, 10.8.4, 10.8
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: c0d07be9ad5eb3bc212c6805cc8031308c56e9b6
+GitCommit: 97e6715fb9f86010de510eef718f7341e3011c25
 Directory: 10.8
 
-Tags: 10.9.1-rc-jammy, 10.9-rc-jammy, 10.9.1-rc, 10.9-rc
+Tags: 10.9.2-jammy, 10.9-jammy, 10-jammy, jammy, 10.9.2, 10.9, 10, latest
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: c0d07be9ad5eb3bc212c6805cc8031308c56e9b6
+GitCommit: 97e6715fb9f86010de510eef718f7341e3011c25
 Directory: 10.9
+
+Tags: 10.10.1-rc-jammy, 10.10-rc-jammy, 10.10.1-rc, 10.10-rc
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 97e6715fb9f86010de510eef718f7341e3011c25
+Directory: 10.10
diff --git a/_bashbrew-list b/_bashbrew-list
index 8f3a71c..2838fd1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,36 +1,36 @@
 mariadb:10
 mariadb:10-jammy
-mariadb:10.2
-mariadb:10.2-bionic
-mariadb:10.2.44
-mariadb:10.2.44-bionic
 mariadb:10.3
 mariadb:10.3-focal
-mariadb:10.3.35
-mariadb:10.3.35-focal
+mariadb:10.3.36
+mariadb:10.3.36-focal
 mariadb:10.4
 mariadb:10.4-focal
-mariadb:10.4.25
-mariadb:10.4.25-focal
+mariadb:10.4.26
+mariadb:10.4.26-focal
 mariadb:10.5
 mariadb:10.5-focal
-mariadb:10.5.16
-mariadb:10.5.16-focal
+mariadb:10.5.17
+mariadb:10.5.17-focal
 mariadb:10.6
 mariadb:10.6-focal
-mariadb:10.6.8
-mariadb:10.6.8-focal
+mariadb:10.6.9
+mariadb:10.6.9-focal
 mariadb:10.7
 mariadb:10.7-focal
-mariadb:10.7.4
-mariadb:10.7.4-focal
+mariadb:10.7.5
+mariadb:10.7.5-focal
 mariadb:10.8
 mariadb:10.8-jammy
-mariadb:10.8.3
-mariadb:10.8.3-jammy
-mariadb:10.9-rc
-mariadb:10.9-rc-jammy
-mariadb:10.9.1-rc
-mariadb:10.9.1-rc-jammy
+mariadb:10.8.4
+mariadb:10.8.4-jammy
+mariadb:10.9
+mariadb:10.9-jammy
+mariadb:10.9.2
+mariadb:10.9.2-jammy
+mariadb:10.10-rc
+mariadb:10.10-rc-jammy
+mariadb:10.10.1-rc
+mariadb:10.10.1-rc-jammy
 mariadb:jammy
 mariadb:latest
diff --git a/mariadb_10.9-rc/Dockerfile b/mariadb_10.10-rc/Dockerfile
similarity index 91%
rename from mariadb_10.9-rc/Dockerfile
rename to mariadb_10.10-rc/Dockerfile
index 729f21f..013a9ce 100644
--- a/mariadb_10.9-rc/Dockerfile
+++ b/mariadb_10.10-rc/Dockerfile
@@ -10,11 +10,6 @@ RUN set -ex; \
 	if ! which gpg; then \
 		apt-get install -y --no-install-recommends gnupg; \
 	fi; \
-	if ! gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \
-# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr
-# so, if we're not running gnupg 1.x, explicitly install dirmngr too
-		apt-get install -y --no-install-recommends dirmngr; \
-	fi; \
 	rm -rf /var/lib/apt/lists/*
 
 # add gosu for easy step-down from root
@@ -76,13 +71,13 @@ RUN set -ex; \
 	apt-key list
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:10.9.1+maria~jammy
+ARG MARIADB_VERSION=1:10.10.1+maria~ubu2204
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:RC
 # (https://downloads.mariadb.org/rest-api/mariadb/)
 
 # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
-ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.9.1/repo/ubuntu/ jammy main"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.10.1/repo/ubuntu/ jammy main"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -102,11 +97,9 @@ RUN set -ex; \
 		echo "mariadb-server" mysql-server/root_password_again password 'unused'; \
 	} | debconf-set-selections; \
 	apt-get update; \
-	apt-get install -y \
-		"mariadb-server=$MARIADB_VERSION" \
 # mariadb-backup is installed at the same time so that `mysql-common` is only installed once from just mariadb repos
-		mariadb-backup \
-		socat \
+	apt-get install -y \
+		"mariadb-server=$MARIADB_VERSION" mariadb-backup socat \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 # purge and re-create /var/lib/mysql with appropriate ownership
diff --git a/mariadb_10.9-rc/docker-entrypoint.sh b/mariadb_10.10-rc/docker-entrypoint.sh
similarity index 97%
rename from mariadb_10.9-rc/docker-entrypoint.sh
rename to mariadb_10.10-rc/docker-entrypoint.sh
index 6abeff6..2f192b8 100755
--- a/mariadb_10.9-rc/docker-entrypoint.sh
+++ b/mariadb_10.10-rc/docker-entrypoint.sh
@@ -186,15 +186,9 @@ _mariadb_version() {
 docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
-	if { mariadb-install-db --help || :; } | grep -q -- '--skip-test-db'; then
-		# 10.3+
-		installArgs+=( --skip-test-db )
-	else
-		# 10.2 only
-		installArgs+=( --skip-auth-anonymous-user )
-	fi
 	# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
 	mariadb-install-db "${installArgs[@]}" "${@:2}" \
+                --skip-test-db \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
 		--skip-log-bin \
 		--expire-logs-days=0 \
@@ -271,8 +265,11 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo \
-			| docker_process_sql --dont-use-mysql-root-password --database=mysql
+		{
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
+			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
+		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password
@@ -305,7 +302,7 @@ docker_setup_db() {
 		# MDEV-24111 before MariaDB-10.4 cannot create unix_socket user directly auth with simple_password_check
 		# It wasn't until 10.4 that the unix_socket auth was built in to the server.
 		read -r -d '' mysqlAtLocalhost <<-EOSQL || true
-		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.[23]\.',
+		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.3\.',
 			"INSTALL PLUGIN /*M10401 IF NOT EXISTS */ unix_socket SONAME 'auth_socket'",
 			"SELECT 'already there'");
 		CREATE USER mysql@localhost IDENTIFIED BY '$pw';
diff --git a/mariadb_10.9-rc/healthcheck.sh b/mariadb_10.10-rc/healthcheck.sh
similarity index 100%
rename from mariadb_10.9-rc/healthcheck.sh
rename to mariadb_10.10-rc/healthcheck.sh
diff --git a/mariadb_10.2/Dockerfile b/mariadb_10.2/Dockerfile
deleted file mode 100644
index 3a1a515..0000000
diff --git a/mariadb_10.2/docker-entrypoint.sh b/mariadb_10.2/docker-entrypoint.sh
deleted file mode 100755
index 44ac1ce..0000000
diff --git a/mariadb_10.2/healthcheck.sh b/mariadb_10.2/healthcheck.sh
deleted file mode 100755
index 3457f43..0000000
diff --git a/mariadb_10.3/Dockerfile b/mariadb_10.3/Dockerfile
index 187b247..884f4b6 100644
--- a/mariadb_10.3/Dockerfile
+++ b/mariadb_10.3/Dockerfile
@@ -10,11 +10,6 @@ RUN set -ex; \
 	if ! which gpg; then \
 		apt-get install -y --no-install-recommends gnupg; \
 	fi; \
-	if ! gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \
-# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr
-# so, if we're not running gnupg 1.x, explicitly install dirmngr too
-		apt-get install -y --no-install-recommends dirmngr; \
-	fi; \
 	rm -rf /var/lib/apt/lists/*
 
 # add gosu for easy step-down from root
@@ -78,13 +73,13 @@ RUN set -ex; \
 # bashbrew-architectures: amd64 arm64v8 ppc64le
 ARG MARIADB_MAJOR=10.3
 ENV MARIADB_MAJOR $MARIADB_MAJOR
-ARG MARIADB_VERSION=1:10.3.35+maria~focal
+ARG MARIADB_VERSION=1:10.3.36+maria~ubu2004
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # (https://downloads.mariadb.org/rest-api/mariadb/)
 
 # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
-ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.3.35/repo/ubuntu/ focal main"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.3.36/repo/ubuntu/ focal main"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -104,11 +99,9 @@ RUN set -ex; \
 		echo "mariadb-server-$MARIADB_MAJOR" mysql-server/root_password_again password 'unused'; \
 	} | debconf-set-selections; \
 	apt-get update; \
-	apt-get install -y \
-		"mariadb-server=$MARIADB_VERSION" \
 # mariadb-backup is installed at the same time so that `mysql-common` is only installed once from just mariadb repos
-		mariadb-backup \
-		socat \
+	apt-get install -y \
+		"mariadb-server=$MARIADB_VERSION" mariadb-backup socat \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 # purge and re-create /var/lib/mysql with appropriate ownership
diff --git a/mariadb_10.3/docker-entrypoint.sh b/mariadb_10.3/docker-entrypoint.sh
index 44ac1ce..a168efb 100755
--- a/mariadb_10.3/docker-entrypoint.sh
+++ b/mariadb_10.3/docker-entrypoint.sh
@@ -186,15 +186,9 @@ _mariadb_version() {
 docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
-	if { mysql_install_db --help || :; } | grep -q -- '--skip-test-db'; then
-		# 10.3+
-		installArgs+=( --skip-test-db )
-	else
-		# 10.2 only
-		installArgs+=( --skip-auth-anonymous-user )
-	fi
 	# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
 	mysql_install_db "${installArgs[@]}" "${@:2}" \
+                --skip-test-db \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
 		--skip-log-bin \
 		--expire-logs-days=0 \
@@ -271,8 +265,11 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo \
-			| docker_process_sql --dont-use-mysql-root-password --database=mysql
+		{
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
+			mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo
+		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password
@@ -305,7 +302,7 @@ docker_setup_db() {
 		# MDEV-24111 before MariaDB-10.4 cannot create unix_socket user directly auth with simple_password_check
 		# It wasn't until 10.4 that the unix_socket auth was built in to the server.
 		read -r -d '' mysqlAtLocalhost <<-EOSQL || true
-		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.[23]\.',
+		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.3\.',
 			"INSTALL PLUGIN /*M10401 IF NOT EXISTS */ unix_socket SONAME 'auth_socket'",
 			"SELECT 'already there'");
 		CREATE USER mysql@localhost IDENTIFIED BY '$pw';
diff --git a/mariadb_10.4/Dockerfile b/mariadb_10.4/Dockerfile
index 89fe277..acf612c 100644
--- a/mariadb_10.4/Dockerfile
+++ b/mariadb_10.4/Dockerfile
@@ -10,11 +10,6 @@ RUN set -ex; \
 	if ! which gpg; then \
 		apt-get install -y --no-install-recommends gnupg; \
 	fi; \
-	if ! gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \
-# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr
-# so, if we're not running gnupg 1.x, explicitly install dirmngr too
-		apt-get install -y --no-install-recommends dirmngr; \
-	fi; \
 	rm -rf /var/lib/apt/lists/*
 
 # add gosu for easy step-down from root
@@ -78,13 +73,13 @@ RUN set -ex; \
 # bashbrew-architectures: amd64 arm64v8 ppc64le
 ARG MARIADB_MAJOR=10.4
 ENV MARIADB_MAJOR $MARIADB_MAJOR
-ARG MARIADB_VERSION=1:10.4.25+maria~focal
+ARG MARIADB_VERSION=1:10.4.26+maria~ubu2004
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # (https://downloads.mariadb.org/rest-api/mariadb/)
 
 # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
-ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.4.25/repo/ubuntu/ focal main"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.4.26/repo/ubuntu/ focal main"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -104,11 +99,9 @@ RUN set -ex; \
 		echo "mariadb-server-$MARIADB_MAJOR" mysql-server/root_password_again password 'unused'; \
 	} | debconf-set-selections; \
 	apt-get update; \
-	apt-get install -y \
-		"mariadb-server=$MARIADB_VERSION" \
 # mariadb-backup is installed at the same time so that `mysql-common` is only installed once from just mariadb repos
-		mariadb-backup \
-		socat \
+	apt-get install -y \
+		"mariadb-server=$MARIADB_VERSION" mariadb-backup socat \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 # purge and re-create /var/lib/mysql with appropriate ownership
diff --git a/mariadb_10.4/docker-entrypoint.sh b/mariadb_10.4/docker-entrypoint.sh
index 44ac1ce..a168efb 100755
--- a/mariadb_10.4/docker-entrypoint.sh
+++ b/mariadb_10.4/docker-entrypoint.sh
@@ -186,15 +186,9 @@ _mariadb_version() {
 docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
-	if { mysql_install_db --help || :; } | grep -q -- '--skip-test-db'; then
-		# 10.3+
-		installArgs+=( --skip-test-db )
-	else
-		# 10.2 only
-		installArgs+=( --skip-auth-anonymous-user )
-	fi
 	# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
 	mysql_install_db "${installArgs[@]}" "${@:2}" \
+                --skip-test-db \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
 		--skip-log-bin \
 		--expire-logs-days=0 \
@@ -271,8 +265,11 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo \
-			| docker_process_sql --dont-use-mysql-root-password --database=mysql
+		{
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
+			mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo
+		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password
@@ -305,7 +302,7 @@ docker_setup_db() {
 		# MDEV-24111 before MariaDB-10.4 cannot create unix_socket user directly auth with simple_password_check
 		# It wasn't until 10.4 that the unix_socket auth was built in to the server.
 		read -r -d '' mysqlAtLocalhost <<-EOSQL || true
-		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.[23]\.',
+		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.3\.',
 			"INSTALL PLUGIN /*M10401 IF NOT EXISTS */ unix_socket SONAME 'auth_socket'",
 			"SELECT 'already there'");
 		CREATE USER mysql@localhost IDENTIFIED BY '$pw';
diff --git a/mariadb_10.5/Dockerfile b/mariadb_10.5/Dockerfile
index a6c1b83..a4a8584 100644
--- a/mariadb_10.5/Dockerfile
+++ b/mariadb_10.5/Dockerfile
@@ -10,11 +10,6 @@ RUN set -ex; \
 	if ! which gpg; then \
 		apt-get install -y --no-install-recommends gnupg; \
 	fi; \
-	if ! gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \
-# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr
-# so, if we're not running gnupg 1.x, explicitly install dirmngr too
-		apt-get install -y --no-install-recommends dirmngr; \
-	fi; \
 	rm -rf /var/lib/apt/lists/*
 
 # add gosu for easy step-down from root
@@ -78,13 +73,13 @@ RUN set -ex; \
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
 ARG MARIADB_MAJOR=10.5
 ENV MARIADB_MAJOR $MARIADB_MAJOR
-ARG MARIADB_VERSION=1:10.5.16+maria~focal
+ARG MARIADB_VERSION=1:10.5.17+maria~ubu2004
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # (https://downloads.mariadb.org/rest-api/mariadb/)
 
 # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
-ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.5.16/repo/ubuntu/ focal main"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.5.17/repo/ubuntu/ focal main"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -104,11 +99,9 @@ RUN set -ex; \
 		echo "mariadb-server-$MARIADB_MAJOR" mysql-server/root_password_again password 'unused'; \
 	} | debconf-set-selections; \
 	apt-get update; \
-	apt-get install -y \
-		"mariadb-server=$MARIADB_VERSION" \
 # mariadb-backup is installed at the same time so that `mysql-common` is only installed once from just mariadb repos
-		mariadb-backup \
-		socat \
+	apt-get install -y \
+		"mariadb-server=$MARIADB_VERSION" mariadb-backup socat \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 # purge and re-create /var/lib/mysql with appropriate ownership
diff --git a/mariadb_10.5/docker-entrypoint.sh b/mariadb_10.5/docker-entrypoint.sh
index 44ac1ce..a168efb 100755
--- a/mariadb_10.5/docker-entrypoint.sh
+++ b/mariadb_10.5/docker-entrypoint.sh
@@ -186,15 +186,9 @@ _mariadb_version() {
 docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
-	if { mysql_install_db --help || :; } | grep -q -- '--skip-test-db'; then
-		# 10.3+
-		installArgs+=( --skip-test-db )
-	else
-		# 10.2 only
-		installArgs+=( --skip-auth-anonymous-user )
-	fi
 	# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
 	mysql_install_db "${installArgs[@]}" "${@:2}" \
+                --skip-test-db \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
 		--skip-log-bin \
 		--expire-logs-days=0 \
@@ -271,8 +265,11 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo \
-			| docker_process_sql --dont-use-mysql-root-password --database=mysql
+		{
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
+			mysql_tzinfo_to_sql --skip-write-binlog /usr/share/zoneinfo
+		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password
@@ -305,7 +302,7 @@ docker_setup_db() {
 		# MDEV-24111 before MariaDB-10.4 cannot create unix_socket user directly auth with simple_password_check
 		# It wasn't until 10.4 that the unix_socket auth was built in to the server.
 		read -r -d '' mysqlAtLocalhost <<-EOSQL || true
-		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.[23]\.',
+		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.3\.',
 			"INSTALL PLUGIN /*M10401 IF NOT EXISTS */ unix_socket SONAME 'auth_socket'",
 			"SELECT 'already there'");
 		CREATE USER mysql@localhost IDENTIFIED BY '$pw';
diff --git a/mariadb_10.6/Dockerfile b/mariadb_10.6/Dockerfile
index d5d5941..5eb289e 100644
--- a/mariadb_10.6/Dockerfile
+++ b/mariadb_10.6/Dockerfile
@@ -10,11 +10,6 @@ RUN set -ex; \
 	if ! which gpg; then \
 		apt-get install -y --no-install-recommends gnupg; \
 	fi; \
-	if ! gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \
-# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr
-# so, if we're not running gnupg 1.x, explicitly install dirmngr too
-		apt-get install -y --no-install-recommends dirmngr; \
-	fi; \
 	rm -rf /var/lib/apt/lists/*
 
 # add gosu for easy step-down from root
@@ -78,13 +73,13 @@ RUN set -ex; \
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
 ARG MARIADB_MAJOR=10.6
 ENV MARIADB_MAJOR $MARIADB_MAJOR
-ARG MARIADB_VERSION=1:10.6.8+maria~focal
+ARG MARIADB_VERSION=1:10.6.9+maria~ubu2004
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # (https://downloads.mariadb.org/rest-api/mariadb/)
 
 # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
-ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.6.8/repo/ubuntu/ focal main"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.6.9/repo/ubuntu/ focal main"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -104,11 +99,9 @@ RUN set -ex; \
 		echo "mariadb-server-$MARIADB_MAJOR" mysql-server/root_password_again password 'unused'; \
 	} | debconf-set-selections; \
 	apt-get update; \
-	apt-get install -y \
-		"mariadb-server=$MARIADB_VERSION" \
 # mariadb-backup is installed at the same time so that `mysql-common` is only installed once from just mariadb repos
-		mariadb-backup \
-		socat \
+	apt-get install -y \
+		"mariadb-server=$MARIADB_VERSION" mariadb-backup socat \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 # purge and re-create /var/lib/mysql with appropriate ownership
diff --git a/mariadb_10.6/docker-entrypoint.sh b/mariadb_10.6/docker-entrypoint.sh
index 6abeff6..2f192b8 100755
--- a/mariadb_10.6/docker-entrypoint.sh
+++ b/mariadb_10.6/docker-entrypoint.sh
@@ -186,15 +186,9 @@ _mariadb_version() {
 docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
-	if { mariadb-install-db --help || :; } | grep -q -- '--skip-test-db'; then
-		# 10.3+
-		installArgs+=( --skip-test-db )
-	else
-		# 10.2 only
-		installArgs+=( --skip-auth-anonymous-user )
-	fi
 	# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
 	mariadb-install-db "${installArgs[@]}" "${@:2}" \
+                --skip-test-db \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
 		--skip-log-bin \
 		--expire-logs-days=0 \
@@ -271,8 +265,11 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo \
-			| docker_process_sql --dont-use-mysql-root-password --database=mysql
+		{
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
+			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
+		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password
@@ -305,7 +302,7 @@ docker_setup_db() {
 		# MDEV-24111 before MariaDB-10.4 cannot create unix_socket user directly auth with simple_password_check
 		# It wasn't until 10.4 that the unix_socket auth was built in to the server.
 		read -r -d '' mysqlAtLocalhost <<-EOSQL || true
-		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.[23]\.',
+		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.3\.',
 			"INSTALL PLUGIN /*M10401 IF NOT EXISTS */ unix_socket SONAME 'auth_socket'",
 			"SELECT 'already there'");
 		CREATE USER mysql@localhost IDENTIFIED BY '$pw';
diff --git a/mariadb_10.7/Dockerfile b/mariadb_10.7/Dockerfile
index 1b60a14..2532aad 100644
--- a/mariadb_10.7/Dockerfile
+++ b/mariadb_10.7/Dockerfile
@@ -10,11 +10,6 @@ RUN set -ex; \
 	if ! which gpg; then \
 		apt-get install -y --no-install-recommends gnupg; \
 	fi; \
-	if ! gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \
-# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr
-# so, if we're not running gnupg 1.x, explicitly install dirmngr too
-		apt-get install -y --no-install-recommends dirmngr; \
-	fi; \
 	rm -rf /var/lib/apt/lists/*
 
 # add gosu for easy step-down from root
@@ -78,13 +73,13 @@ RUN set -ex; \
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
 ARG MARIADB_MAJOR=10.7
 ENV MARIADB_MAJOR $MARIADB_MAJOR
-ARG MARIADB_VERSION=1:10.7.4+maria~focal
+ARG MARIADB_VERSION=1:10.7.5+maria~ubu2004
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # (https://downloads.mariadb.org/rest-api/mariadb/)
 
 # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
-ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.7.4/repo/ubuntu/ focal main"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.7.5/repo/ubuntu/ focal main"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -104,11 +99,9 @@ RUN set -ex; \
 		echo "mariadb-server-$MARIADB_MAJOR" mysql-server/root_password_again password 'unused'; \
 	} | debconf-set-selections; \
 	apt-get update; \
-	apt-get install -y \
-		"mariadb-server=$MARIADB_VERSION" \
 # mariadb-backup is installed at the same time so that `mysql-common` is only installed once from just mariadb repos
-		mariadb-backup \
-		socat \
+	apt-get install -y \
+		"mariadb-server=$MARIADB_VERSION" mariadb-backup socat \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 # purge and re-create /var/lib/mysql with appropriate ownership
diff --git a/mariadb_10.7/docker-entrypoint.sh b/mariadb_10.7/docker-entrypoint.sh
index 6abeff6..2f192b8 100755
--- a/mariadb_10.7/docker-entrypoint.sh
+++ b/mariadb_10.7/docker-entrypoint.sh
@@ -186,15 +186,9 @@ _mariadb_version() {
 docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
-	if { mariadb-install-db --help || :; } | grep -q -- '--skip-test-db'; then
-		# 10.3+
-		installArgs+=( --skip-test-db )
-	else
-		# 10.2 only
-		installArgs+=( --skip-auth-anonymous-user )
-	fi
 	# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
 	mariadb-install-db "${installArgs[@]}" "${@:2}" \
+                --skip-test-db \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
 		--skip-log-bin \
 		--expire-logs-days=0 \
@@ -271,8 +265,11 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo \
-			| docker_process_sql --dont-use-mysql-root-password --database=mysql
+		{
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
+			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
+		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password
@@ -305,7 +302,7 @@ docker_setup_db() {
 		# MDEV-24111 before MariaDB-10.4 cannot create unix_socket user directly auth with simple_password_check
 		# It wasn't until 10.4 that the unix_socket auth was built in to the server.
 		read -r -d '' mysqlAtLocalhost <<-EOSQL || true
-		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.[23]\.',
+		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.3\.',
 			"INSTALL PLUGIN /*M10401 IF NOT EXISTS */ unix_socket SONAME 'auth_socket'",
 			"SELECT 'already there'");
 		CREATE USER mysql@localhost IDENTIFIED BY '$pw';
diff --git a/mariadb_latest/Dockerfile b/mariadb_10.8/Dockerfile
similarity index 92%
copy from mariadb_latest/Dockerfile
copy to mariadb_10.8/Dockerfile
index 9bac6c0..f712b91 100644
--- a/mariadb_latest/Dockerfile
+++ b/mariadb_10.8/Dockerfile
@@ -10,11 +10,6 @@ RUN set -ex; \
 	if ! which gpg; then \
 		apt-get install -y --no-install-recommends gnupg; \
 	fi; \
-	if ! gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \
-# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr
-# so, if we're not running gnupg 1.x, explicitly install dirmngr too
-		apt-get install -y --no-install-recommends dirmngr; \
-	fi; \
 	rm -rf /var/lib/apt/lists/*
 
 # add gosu for easy step-down from root
@@ -78,13 +73,13 @@ RUN set -ex; \
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
 ARG MARIADB_MAJOR=10.8
 ENV MARIADB_MAJOR $MARIADB_MAJOR
-ARG MARIADB_VERSION=1:10.8.3+maria~jammy
+ARG MARIADB_VERSION=1:10.8.4+maria~ubu2204
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # (https://downloads.mariadb.org/rest-api/mariadb/)
 
 # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
-ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.8.3/repo/ubuntu/ jammy main"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.8.4/repo/ubuntu/ jammy main"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -104,11 +99,9 @@ RUN set -ex; \
 		echo "mariadb-server-$MARIADB_MAJOR" mysql-server/root_password_again password 'unused'; \
 	} | debconf-set-selections; \
 	apt-get update; \
-	apt-get install -y \
-		"mariadb-server=$MARIADB_VERSION" \
 # mariadb-backup is installed at the same time so that `mysql-common` is only installed once from just mariadb repos
-		mariadb-backup \
-		socat \
+	apt-get install -y \
+		"mariadb-server=$MARIADB_VERSION" mariadb-backup socat \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 # purge and re-create /var/lib/mysql with appropriate ownership
diff --git a/mariadb_10.6/docker-entrypoint.sh b/mariadb_10.8/docker-entrypoint.sh
similarity index 97%
copy from mariadb_10.6/docker-entrypoint.sh
copy to mariadb_10.8/docker-entrypoint.sh
index 6abeff6..2f192b8 100755
--- a/mariadb_10.6/docker-entrypoint.sh
+++ b/mariadb_10.8/docker-entrypoint.sh
@@ -186,15 +186,9 @@ _mariadb_version() {
 docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
-	if { mariadb-install-db --help || :; } | grep -q -- '--skip-test-db'; then
-		# 10.3+
-		installArgs+=( --skip-test-db )
-	else
-		# 10.2 only
-		installArgs+=( --skip-auth-anonymous-user )
-	fi
 	# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
 	mariadb-install-db "${installArgs[@]}" "${@:2}" \
+                --skip-test-db \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
 		--skip-log-bin \
 		--expire-logs-days=0 \
@@ -271,8 +265,11 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo \
-			| docker_process_sql --dont-use-mysql-root-password --database=mysql
+		{
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
+			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
+		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password
@@ -305,7 +302,7 @@ docker_setup_db() {
 		# MDEV-24111 before MariaDB-10.4 cannot create unix_socket user directly auth with simple_password_check
 		# It wasn't until 10.4 that the unix_socket auth was built in to the server.
 		read -r -d '' mysqlAtLocalhost <<-EOSQL || true
-		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.[23]\.',
+		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.3\.',
 			"INSTALL PLUGIN /*M10401 IF NOT EXISTS */ unix_socket SONAME 'auth_socket'",
 			"SELECT 'already there'");
 		CREATE USER mysql@localhost IDENTIFIED BY '$pw';
diff --git a/mariadb_10.6/healthcheck.sh b/mariadb_10.8/healthcheck.sh
similarity index 100%
copy from mariadb_10.6/healthcheck.sh
copy to mariadb_10.8/healthcheck.sh
diff --git a/mariadb_latest/Dockerfile b/mariadb_latest/Dockerfile
index 9bac6c0..2271329 100644
--- a/mariadb_latest/Dockerfile
+++ b/mariadb_latest/Dockerfile
@@ -10,11 +10,6 @@ RUN set -ex; \
 	if ! which gpg; then \
 		apt-get install -y --no-install-recommends gnupg; \
 	fi; \
-	if ! gpg --version | grep -q '^gpg (GnuPG) 1\.'; then \
-# Ubuntu includes "gnupg" (not "gnupg2", but still 2.x), but not dirmngr, and gnupg 2.x requires dirmngr
-# so, if we're not running gnupg 1.x, explicitly install dirmngr too
-		apt-get install -y --no-install-recommends dirmngr; \
-	fi; \
 	rm -rf /var/lib/apt/lists/*
 
 # add gosu for easy step-down from root
@@ -76,15 +71,13 @@ RUN set -ex; \
 	apt-key list
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_MAJOR=10.8
-ENV MARIADB_MAJOR $MARIADB_MAJOR
-ARG MARIADB_VERSION=1:10.8.3+maria~jammy
+ARG MARIADB_VERSION=1:10.9.2+maria~ubu2204
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # (https://downloads.mariadb.org/rest-api/mariadb/)
 
 # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
-ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.8.3/repo/ubuntu/ jammy main"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.9.2/repo/ubuntu/ jammy main"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -100,15 +93,13 @@ 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; \
-	apt-get install -y \
-		"mariadb-server=$MARIADB_VERSION" \
 # mariadb-backup is installed at the same time so that `mysql-common` is only installed once from just mariadb repos
-		mariadb-backup \
-		socat \
+	apt-get install -y \
+		"mariadb-server=$MARIADB_VERSION" mariadb-backup socat \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 # purge and re-create /var/lib/mysql with appropriate ownership
diff --git a/mariadb_latest/docker-entrypoint.sh b/mariadb_latest/docker-entrypoint.sh
index 6abeff6..2f192b8 100755
--- a/mariadb_latest/docker-entrypoint.sh
+++ b/mariadb_latest/docker-entrypoint.sh
@@ -186,15 +186,9 @@ _mariadb_version() {
 docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
-	if { mariadb-install-db --help || :; } | grep -q -- '--skip-test-db'; then
-		# 10.3+
-		installArgs+=( --skip-test-db )
-	else
-		# 10.2 only
-		installArgs+=( --skip-auth-anonymous-user )
-	fi
 	# "Other options are passed to mariadbd." (so we pass all "mysqld" arguments directly here)
 	mariadb-install-db "${installArgs[@]}" "${@:2}" \
+                --skip-test-db \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
 		--skip-log-bin \
 		--expire-logs-days=0 \
@@ -271,8 +265,11 @@ docker_setup_db() {
 		# --skip-write-binlog usefully disables binary logging
 		# but also outputs LOCK TABLES to improve the IO of
 		# Aria (MDEV-23326) for 10.4+.
-		mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo \
-			| docker_process_sql --dont-use-mysql-root-password --database=mysql
+		{
+			# temporary fix for MDEV-29347 - ONLY_FULL_GROUP_BY incompatiblity
+			echo "SET @@SQL_MODE = REPLACE(@@SQL_MODE, 'ONLY_FULL_GROUP_BY', '');"
+			mariadb-tzinfo-to-sql --skip-write-binlog /usr/share/zoneinfo
+		} | docker_process_sql --dont-use-mysql-root-password --database=mysql
 		# tell docker_process_sql to not use MYSQL_ROOT_PASSWORD since it is not set yet
 	fi
 	# Generate random root password
@@ -305,7 +302,7 @@ docker_setup_db() {
 		# MDEV-24111 before MariaDB-10.4 cannot create unix_socket user directly auth with simple_password_check
 		# It wasn't until 10.4 that the unix_socket auth was built in to the server.
 		read -r -d '' mysqlAtLocalhost <<-EOSQL || true
-		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.[23]\.',
+		EXECUTE IMMEDIATE IF(VERSION() RLIKE '^10\.3\.',
 			"INSTALL PLUGIN /*M10401 IF NOT EXISTS */ unix_socket SONAME 'auth_socket'",
 			"SELECT 'already there'");
 		CREATE USER mysql@localhost IDENTIFIED BY '$pw';

Relevant Maintainers:

@tianon tianon merged commit eeac42b into docker-library:master Aug 23, 2022
@grooverdan
Copy link
Contributor Author

Thank you kindly.

@grooverdan grooverdan deleted the q3-2022 branch August 24, 2022 05:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants