MariaDB 2024 Q2 part 1 release #16821

grooverdan · 2024-05-23T05:30:14Z

The new 11.4 release is a little late going though QA so it will occur later. In the mean time we keep the 11.3 as the latest tag so it isn't a downgrade.

The new 11.4 release is a little late going though QA so it will occur later. In the mean time we keep the 11.3 as the latest tag so it isn't a downgrade. As such 11.3 and 11.4 don't have the fix for issue 560. We also filter our spaces in the command when passing to the mariadb-install-db as it cannot handle this currently.

github-actions · 2024-05-23T05:51:02Z

Diff for 367c6fb:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 12fd282..6ca2aeb 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,47 +1,47 @@
 Maintainers: Daniel Black <[email protected]> (@grooverdan), Daniel Bartholomew <[email protected]> (@dbart), Faustin Lammler <[email protected]> (@fauust)
 GitRepo: https://github.com/MariaDB/mariadb-docker.git
 
-Tags: 10.4.33-focal, 10.4-focal, 10.4.33, 10.4
+Tags: 10.4.34-focal, 10.4-focal, 10.4.34, 10.4
 Architectures: amd64, arm64v8, ppc64le
-GitCommit: 1d95dfc811b0666ab39cecdbf88c4d956e74f765
+GitCommit: 44ed2e231207787c08d56acc94b79d5f06efe006
 Directory: 10.4
 
-Tags: 10.5.24-focal, 10.5-focal, 10.5.24, 10.5
+Tags: 10.5.25-focal, 10.5-focal, 10.5.25, 10.5
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
+GitCommit: 44ed2e231207787c08d56acc94b79d5f06efe006
 Directory: 10.5
 
-Tags: 10.6.17-focal, 10.6-focal, 10.6.17, 10.6
+Tags: 10.6.18-focal, 10.6-focal, 10.6.18, 10.6
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
+GitCommit: 44ed2e231207787c08d56acc94b79d5f06efe006
 Directory: 10.6
 
-Tags: 10.11.7-jammy, 10.11-jammy, 10-jammy, lts-jammy, 10.11.7, 10.11, 10, lts
+Tags: 10.11.8-jammy, 10.11-jammy, 10-jammy, lts-jammy, 10.11.8, 10.11, 10, lts
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
+GitCommit: 44ed2e231207787c08d56acc94b79d5f06efe006
 Directory: 10.11
 
-Tags: 11.0.5-jammy, 11.0-jammy, 11.0.5, 11.0
+Tags: 11.0.6-jammy, 11.0-jammy, 11.0.6, 11.0
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
+GitCommit: 44ed2e231207787c08d56acc94b79d5f06efe006
 Directory: 11.0
 
-Tags: 11.1.4-jammy, 11.1-jammy, 11.1.4, 11.1
+Tags: 11.1.5-jammy, 11.1-jammy, 11.1.5, 11.1
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
+GitCommit: 44ed2e231207787c08d56acc94b79d5f06efe006
 Directory: 11.1
 
-Tags: 11.2.3-jammy, 11.2-jammy, 11.2.3, 11.2
+Tags: 11.2.4-jammy, 11.2-jammy, 11.2.4, 11.2
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
+GitCommit: 44ed2e231207787c08d56acc94b79d5f06efe006
 Directory: 11.2
 
 Tags: 11.3.2-jammy, 11.3-jammy, 11-jammy, jammy, 11.3.2, 11.3, 11, latest
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
+GitCommit: e0677724cbe9f932a568c8f85bca6c14d460bbb4
 Directory: 11.3
 
 Tags: 11.4.1-rc-jammy, 11.4-rc-jammy, 11.4.1-rc, 11.4-rc
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d7a950d41e9347ac94ad2d2f28469bff74858db7
+GitCommit: e0677724cbe9f932a568c8f85bca6c14d460bbb4
 Directory: 11.4
diff --git a/_bashbrew-list b/_bashbrew-list
index 8b438b9..4284d03 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,34 +2,34 @@ mariadb:10
 mariadb:10-jammy
 mariadb:10.4
 mariadb:10.4-focal
-mariadb:10.4.33
-mariadb:10.4.33-focal
+mariadb:10.4.34
+mariadb:10.4.34-focal
 mariadb:10.5
 mariadb:10.5-focal
-mariadb:10.5.24
-mariadb:10.5.24-focal
+mariadb:10.5.25
+mariadb:10.5.25-focal
 mariadb:10.6
 mariadb:10.6-focal
-mariadb:10.6.17
-mariadb:10.6.17-focal
+mariadb:10.6.18
+mariadb:10.6.18-focal
 mariadb:10.11
 mariadb:10.11-jammy
-mariadb:10.11.7
-mariadb:10.11.7-jammy
+mariadb:10.11.8
+mariadb:10.11.8-jammy
 mariadb:11
 mariadb:11-jammy
 mariadb:11.0
 mariadb:11.0-jammy
-mariadb:11.0.5
-mariadb:11.0.5-jammy
+mariadb:11.0.6
+mariadb:11.0.6-jammy
 mariadb:11.1
 mariadb:11.1-jammy
-mariadb:11.1.4
-mariadb:11.1.4-jammy
+mariadb:11.1.5
+mariadb:11.1.5-jammy
 mariadb:11.2
 mariadb:11.2-jammy
-mariadb:11.2.3
-mariadb:11.2.3-jammy
+mariadb:11.2.4
+mariadb:11.2.4-jammy
 mariadb:11.3
 mariadb:11.3-jammy
 mariadb:11.3.2
diff --git a/mariadb_10.4/Dockerfile b/mariadb_10.4/Dockerfile
index 177a2fc..b8aa5b1 100644
--- a/mariadb_10.4/Dockerfile
+++ b/mariadb_10.4/Dockerfile
@@ -75,20 +75,20 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
       org.opencontainers.image.licenses="GPL-2.0" \
       org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
       org.opencontainers.image.vendor="MariaDB Community" \
-      org.opencontainers.image.version="10.4.33" \
+      org.opencontainers.image.version="10.4.34" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le
 ARG MARIADB_MAJOR=10.4
 ENV MARIADB_MAJOR $MARIADB_MAJOR
-ARG MARIADB_VERSION=1:10.4.33+maria~ubu2004
+ARG MARIADB_VERSION=1:10.4.34+maria~ubu2004
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # release-support-type:Long Term Support
 # (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.33/repo/ubuntu/ focal main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.4.34/repo/ubuntu/ focal main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
diff --git a/mariadb_10.4/docker-entrypoint.sh b/mariadb_10.4/docker-entrypoint.sh
index 0253377..85110e8 100755
--- a/mariadb_10.4/docker-entrypoint.sh
+++ b/mariadb_10.4/docker-entrypoint.sh
@@ -210,9 +210,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "10.4.34-MariaDB"
 }
 
 # initializes the database directory
@@ -220,7 +218,17 @@ docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
 	# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
-	mysql_install_db "${installArgs[@]}" "${@:2}" \
+
+	local mariadbdArgs=()
+	for arg in "${@:2}"; do
+		# Check if the argument contains whitespace
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
+		else
+			mariadbdArgs+=("$arg")
+		fi
+	done
+	mysql_install_db "${installArgs[@]}" "${mariadbdArgs[@]}" \
 		--skip-test-db \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
 		--skip-log-bin \
diff --git a/mariadb_10.5/Dockerfile b/mariadb_10.5/Dockerfile
index 87fa3de..23ef5ca 100644
--- a/mariadb_10.5/Dockerfile
+++ b/mariadb_10.5/Dockerfile
@@ -75,20 +75,20 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
       org.opencontainers.image.licenses="GPL-2.0" \
       org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
       org.opencontainers.image.vendor="MariaDB Community" \
-      org.opencontainers.image.version="10.5.24" \
+      org.opencontainers.image.version="10.5.25" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
 ARG MARIADB_MAJOR=10.5
 ENV MARIADB_MAJOR $MARIADB_MAJOR
-ARG MARIADB_VERSION=1:10.5.24+maria~ubu2004
+ARG MARIADB_VERSION=1:10.5.25+maria~ubu2004
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # release-support-type:Long Term Support
 # (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.24/repo/ubuntu/ focal main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.5.25/repo/ubuntu/ focal main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -127,8 +127,6 @@ RUN set -ex; \
 		| xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \
 # don't reverse lookup hostnames, they are usually another container
 	printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \
-# Issue #560
-	sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \
 # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation)
 	if [ -L /etc/mysql/my.cnf ]; then \
 # 10.5+
diff --git a/mariadb_10.5/docker-entrypoint.sh b/mariadb_10.5/docker-entrypoint.sh
index 0223440..f6c5dd5 100755
--- a/mariadb_10.5/docker-entrypoint.sh
+++ b/mariadb_10.5/docker-entrypoint.sh
@@ -210,9 +210,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "10.5.25-MariaDB"
 }
 
 # initializes the database directory
@@ -220,7 +218,17 @@ docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
 	# "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here)
-	mysql_install_db "${installArgs[@]}" "${@:2}" \
+
+	local mariadbdArgs=()
+	for arg in "${@:2}"; do
+		# Check if the argument contains whitespace
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
+		else
+			mariadbdArgs+=("$arg")
+		fi
+	done
+	mysql_install_db "${installArgs[@]}" "${mariadbdArgs[@]}" \
 		--skip-test-db \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
 		--skip-log-bin \
diff --git a/mariadb_10.6/Dockerfile b/mariadb_10.6/Dockerfile
index a1e6406..1c37d55 100644
--- a/mariadb_10.6/Dockerfile
+++ b/mariadb_10.6/Dockerfile
@@ -75,20 +75,20 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
       org.opencontainers.image.licenses="GPL-2.0" \
       org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
       org.opencontainers.image.vendor="MariaDB Community" \
-      org.opencontainers.image.version="10.6.17" \
+      org.opencontainers.image.version="10.6.18" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
 ARG MARIADB_MAJOR=10.6
 ENV MARIADB_MAJOR $MARIADB_MAJOR
-ARG MARIADB_VERSION=1:10.6.17+maria~ubu2004
+ARG MARIADB_VERSION=1:10.6.18+maria~ubu2004
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # release-support-type:Long Term Support
 # (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.17/repo/ubuntu/ focal main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.6.18/repo/ubuntu/ focal main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -127,8 +127,6 @@ RUN set -ex; \
 		| xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \
 # don't reverse lookup hostnames, they are usually another container
 	printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \
-# Issue #560
-	sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \
 # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation)
 	if [ -L /etc/mysql/my.cnf ]; then \
 # 10.5+
diff --git a/mariadb_10.6/docker-entrypoint.sh b/mariadb_10.6/docker-entrypoint.sh
index bb9aef3..4738c6a 100755
--- a/mariadb_10.6/docker-entrypoint.sh
+++ b/mariadb_10.6/docker-entrypoint.sh
@@ -210,9 +210,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "10.6.18-MariaDB"
 }
 
 # initializes the database directory
@@ -220,7 +218,17 @@ docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
 	# "Other options are passed to mariadbd." (so we pass all "mariadbd" arguments directly here)
-	mariadb-install-db "${installArgs[@]}" "${@:2}" \
+
+	local mariadbdArgs=()
+	for arg in "${@:2}"; do
+		# Check if the argument contains whitespace
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
+		else
+			mariadbdArgs+=("$arg")
+		fi
+	done
+	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \
 		--skip-test-db \
 		--old-mode='UTF8_IS_UTF8MB3' \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
diff --git a/mariadb_11.0/Dockerfile b/mariadb_11.0/Dockerfile
index 279c81b..9cd1201 100644
--- a/mariadb_11.0/Dockerfile
+++ b/mariadb_11.0/Dockerfile
@@ -75,18 +75,18 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
       org.opencontainers.image.licenses="GPL-2.0" \
       org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
       org.opencontainers.image.vendor="MariaDB Community" \
-      org.opencontainers.image.version="11.0.5" \
+      org.opencontainers.image.version="11.0.6" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:11.0.5+maria~ubu2204
+ARG MARIADB_VERSION=1:11.0.6+maria~ubu2204
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # release-support-type:Short Term Support
 # (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-11.0.5/repo/ubuntu/ jammy main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.0.6/repo/ubuntu/ jammy main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -125,8 +125,6 @@ RUN set -ex; \
 		| xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \
 # don't reverse lookup hostnames, they are usually another container
 	printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \
-# Issue #560
-	sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \
 # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation)
 	if [ -L /etc/mysql/my.cnf ]; then \
 # 10.5+
diff --git a/mariadb_11.0/docker-entrypoint.sh b/mariadb_11.0/docker-entrypoint.sh
index 5c9fc4f..a7579f5 100755
--- a/mariadb_11.0/docker-entrypoint.sh
+++ b/mariadb_11.0/docker-entrypoint.sh
@@ -218,9 +218,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "11.0.6-MariaDB"
 }
 
 # initializes the database directory
@@ -228,7 +226,17 @@ docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
 	# "Other options are passed to mariadbd." (so we pass all "mariadbd" arguments directly here)
-	mariadb-install-db "${installArgs[@]}" "${@:2}" \
+
+	local mariadbdArgs=()
+	for arg in "${@:2}"; do
+		# Check if the argument contains whitespace
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
+		else
+			mariadbdArgs+=("$arg")
+		fi
+	done
+	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \
 		--skip-test-db \
 		--old-mode='UTF8_IS_UTF8MB3' \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
diff --git a/mariadb_11.1/Dockerfile b/mariadb_11.1/Dockerfile
index 90304b2..99d66fa 100644
--- a/mariadb_11.1/Dockerfile
+++ b/mariadb_11.1/Dockerfile
@@ -75,18 +75,18 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
       org.opencontainers.image.licenses="GPL-2.0" \
       org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
       org.opencontainers.image.vendor="MariaDB Community" \
-      org.opencontainers.image.version="11.1.4" \
+      org.opencontainers.image.version="11.1.5" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:11.1.4+maria~ubu2204
+ARG MARIADB_VERSION=1:11.1.5+maria~ubu2204
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # release-support-type:Short Term Support
 # (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-11.1.4/repo/ubuntu/ jammy main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.1.5/repo/ubuntu/ jammy main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -125,8 +125,6 @@ RUN set -ex; \
 		| xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \
 # don't reverse lookup hostnames, they are usually another container
 	printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \
-# Issue #560
-	sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \
 # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation)
 	if [ -L /etc/mysql/my.cnf ]; then \
 # 10.5+
diff --git a/mariadb_11.1/docker-entrypoint.sh b/mariadb_11.1/docker-entrypoint.sh
index 5c9fc4f..8e15ea0 100755
--- a/mariadb_11.1/docker-entrypoint.sh
+++ b/mariadb_11.1/docker-entrypoint.sh
@@ -218,9 +218,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "11.1.5-MariaDB"
 }
 
 # initializes the database directory
@@ -228,7 +226,17 @@ docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
 	# "Other options are passed to mariadbd." (so we pass all "mariadbd" arguments directly here)
-	mariadb-install-db "${installArgs[@]}" "${@:2}" \
+
+	local mariadbdArgs=()
+	for arg in "${@:2}"; do
+		# Check if the argument contains whitespace
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
+		else
+			mariadbdArgs+=("$arg")
+		fi
+	done
+	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \
 		--skip-test-db \
 		--old-mode='UTF8_IS_UTF8MB3' \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
diff --git a/mariadb_11.2/Dockerfile b/mariadb_11.2/Dockerfile
index 0016c7a..657e955 100644
--- a/mariadb_11.2/Dockerfile
+++ b/mariadb_11.2/Dockerfile
@@ -75,18 +75,18 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
       org.opencontainers.image.licenses="GPL-2.0" \
       org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
       org.opencontainers.image.vendor="MariaDB Community" \
-      org.opencontainers.image.version="11.2.3" \
+      org.opencontainers.image.version="11.2.4" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:11.2.3+maria~ubu2204
+ARG MARIADB_VERSION=1:11.2.4+maria~ubu2204
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # release-support-type:Short Term Support
 # (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-11.2.3/repo/ubuntu/ jammy main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-11.2.4/repo/ubuntu/ jammy main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -125,8 +125,6 @@ RUN set -ex; \
 		| xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \
 # don't reverse lookup hostnames, they are usually another container
 	printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \
-# Issue #560
-	sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \
 # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation)
 	if [ -L /etc/mysql/my.cnf ]; then \
 # 10.5+
diff --git a/mariadb_11.2/docker-entrypoint.sh b/mariadb_11.2/docker-entrypoint.sh
index 5c9fc4f..e41ed9c 100755
--- a/mariadb_11.2/docker-entrypoint.sh
+++ b/mariadb_11.2/docker-entrypoint.sh
@@ -218,9 +218,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "11.2.4-MariaDB"
 }
 
 # initializes the database directory
@@ -228,7 +226,17 @@ docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
 	# "Other options are passed to mariadbd." (so we pass all "mariadbd" arguments directly here)
-	mariadb-install-db "${installArgs[@]}" "${@:2}" \
+
+	local mariadbdArgs=()
+	for arg in "${@:2}"; do
+		# Check if the argument contains whitespace
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
+		else
+			mariadbdArgs+=("$arg")
+		fi
+	done
+	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \
 		--skip-test-db \
 		--old-mode='UTF8_IS_UTF8MB3' \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
diff --git a/mariadb_11.4-rc/Dockerfile b/mariadb_11.4-rc/Dockerfile
index 704f735..5145a92 100644
--- a/mariadb_11.4-rc/Dockerfile
+++ b/mariadb_11.4-rc/Dockerfile
@@ -82,7 +82,7 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
 ARG MARIADB_VERSION=1:11.4.1+maria~ubu2204
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:RC
-# release-support-type:Short Term Support
+# release-support-type:Long Term Support
 # (https://downloads.mariadb.org/rest-api/mariadb/)
 
 # Allowing overriding of REPOSITORY, a URL that includes suite and component for testing and Enterprise Versions
diff --git a/mariadb_11.4-rc/docker-entrypoint.sh b/mariadb_11.4-rc/docker-entrypoint.sh
index 5c9fc4f..baa01fd 100755
--- a/mariadb_11.4-rc/docker-entrypoint.sh
+++ b/mariadb_11.4-rc/docker-entrypoint.sh
@@ -218,9 +218,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "11.4.1-MariaDB"
 }
 
 # initializes the database directory
@@ -228,7 +226,17 @@ docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
 	# "Other options are passed to mariadbd." (so we pass all "mariadbd" arguments directly here)
-	mariadb-install-db "${installArgs[@]}" "${@:2}" \
+
+	local mariadbdArgs=()
+	for arg in "${@:2}"; do
+		# Check if the argument contains whitespace
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
+		else
+			mariadbdArgs+=("$arg")
+		fi
+	done
+	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \
 		--skip-test-db \
 		--old-mode='UTF8_IS_UTF8MB3' \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
diff --git a/mariadb_latest/docker-entrypoint.sh b/mariadb_latest/docker-entrypoint.sh
index 5c9fc4f..79302cb 100755
--- a/mariadb_latest/docker-entrypoint.sh
+++ b/mariadb_latest/docker-entrypoint.sh
@@ -218,9 +218,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "11.3.2-MariaDB"
 }
 
 # initializes the database directory
@@ -228,7 +226,17 @@ docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
 	# "Other options are passed to mariadbd." (so we pass all "mariadbd" arguments directly here)
-	mariadb-install-db "${installArgs[@]}" "${@:2}" \
+
+	local mariadbdArgs=()
+	for arg in "${@:2}"; do
+		# Check if the argument contains whitespace
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
+		else
+			mariadbdArgs+=("$arg")
+		fi
+	done
+	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \
 		--skip-test-db \
 		--old-mode='UTF8_IS_UTF8MB3' \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \
diff --git a/mariadb_lts/Dockerfile b/mariadb_lts/Dockerfile
index eb0ffd3..eccf7f7 100644
--- a/mariadb_lts/Dockerfile
+++ b/mariadb_lts/Dockerfile
@@ -75,18 +75,18 @@ LABEL org.opencontainers.image.authors="MariaDB Community" \
       org.opencontainers.image.licenses="GPL-2.0" \
       org.opencontainers.image.source="https://github.com/MariaDB/mariadb-docker" \
       org.opencontainers.image.vendor="MariaDB Community" \
-      org.opencontainers.image.version="10.11.7" \
+      org.opencontainers.image.version="10.11.8" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:10.11.7+maria~ubu2204
+ARG MARIADB_VERSION=1:10.11.8+maria~ubu2204
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Stable
 # release-support-type:Long Term Support
 # (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.11.7/repo/ubuntu/ jammy main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.11.8/repo/ubuntu/ jammy main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -125,8 +125,6 @@ RUN set -ex; \
 		| xargs -rt -0 sed -Ei 's/^(bind-address|log|user\s)/#&/'; \
 # don't reverse lookup hostnames, they are usually another container
 	printf "[mariadb]\nhost-cache-size=0\nskip-name-resolve\n" > /etc/mysql/mariadb.conf.d/05-skipcache.cnf; \
-# Issue #560
-	sed -i -e '/character-set-collations/d' /etc/mysql/mariadb.conf.d/50-server.cnf; \
 # Issue #327 Correct order of reading directories /etc/mysql/mariadb.conf.d before /etc/mysql/conf.d (mount-point per documentation)
 	if [ -L /etc/mysql/my.cnf ]; then \
 # 10.5+
diff --git a/mariadb_lts/docker-entrypoint.sh b/mariadb_lts/docker-entrypoint.sh
index 20fefd4..6e50e1c 100755
--- a/mariadb_lts/docker-entrypoint.sh
+++ b/mariadb_lts/docker-entrypoint.sh
@@ -218,9 +218,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-        local mariaVersion="${MARIADB_VERSION##*:}"
-        mariaVersion="${mariaVersion%%[-+~]*}"
-	echo -n "${mariaVersion}-MariaDB"
+	echo -n "10.11.8-MariaDB"
 }
 
 # initializes the database directory
@@ -228,7 +226,17 @@ docker_init_database_dir() {
 	mysql_note "Initializing database files"
 	installArgs=( --datadir="$DATADIR" --rpm --auth-root-authentication-method=normal )
 	# "Other options are passed to mariadbd." (so we pass all "mariadbd" arguments directly here)
-	mariadb-install-db "${installArgs[@]}" "${@:2}" \
+
+	local mariadbdArgs=()
+	for arg in "${@:2}"; do
+		# Check if the argument contains whitespace
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
+		else
+			mariadbdArgs+=("$arg")
+		fi
+	done
+	mariadb-install-db "${installArgs[@]}" "${mariadbdArgs[@]}" \
 		--skip-test-db \
 		--old-mode='UTF8_IS_UTF8MB3' \
 		--default-time-zone=SYSTEM --enforce-storage-engine= \

Relevant Maintainers:

mariadb: @grooverdan @dbart @fauust

grooverdan · 2024-05-23T23:32:34Z

Thanks @yosifkit

tianon · 2024-05-24T16:42:16Z

+		# Check if the argument contains whitespace
+		if [[ "$arg" =~ [[:space:]] ]]; then
+			mysql_warn "Not passing argument \'$arg\' to mariadb-install-db because mariadb-install-db does not support arguments with whitespace."
+		else
+			mariadbdArgs+=("$arg")
+		fi

This is interesting -- it sounds like the underlying problem is probably an argument quoting bug in mariadb-install-db (that could potentially be fixed)? 👀

fauust · 2024-05-24T16:56:54Z

Yes, @tianon, see:

Crash when entrypoint inits database and passing init-connect argument with whitespace MariaDB/mariadb-docker#574
do not pass mariadbd arguments with whitespace to mariadb-install-db MariaDB/mariadb-docker#575

grooverdan requested a review from a team as a code owner May 23, 2024 05:30

github-actions bot added the library/mariadb label May 23, 2024

This comment has been minimized.

Sign in to view

grooverdan mentioned this pull request May 23, 2024

Why is there no 10.5.25 or 10.6.18 MariaDB/mariadb-docker#577

Closed

grooverdan force-pushed the mariadb_2024_q2_p1 branch from 008cb51 to 367c6fb Compare May 23, 2024 05:49

yosifkit mentioned this pull request May 23, 2024

can not find mariadb:10.11.8 images in https://hub.docker.com/_/mariadb #16822

Closed

yosifkit approved these changes May 23, 2024

View reviewed changes

yosifkit merged commit e858e47 into docker-library:master May 23, 2024
14 checks passed

grooverdan deleted the mariadb_2024_q2_p1 branch May 23, 2024 23:32

grooverdan mentioned this pull request May 31, 2024

missing arm64v8 layers in MariaDB image #16885

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MariaDB 2024 Q2 part 1 release #16821

MariaDB 2024 Q2 part 1 release #16821

grooverdan commented May 23, 2024

This comment has been minimized.

github-actions bot commented May 23, 2024

grooverdan commented May 23, 2024

tianon commented May 24, 2024

fauust commented May 24, 2024 •

edited

Loading

MariaDB 2024 Q2 part 1 release #16821

MariaDB 2024 Q2 part 1 release #16821

Conversation

grooverdan commented May 23, 2024

This comment has been minimized.

github-actions bot commented May 23, 2024

grooverdan commented May 23, 2024

tianon commented May 24, 2024

fauust commented May 24, 2024 • edited Loading

fauust commented May 24, 2024 •

edited

Loading