Merge branch 'MariaDB:master' into master

Author: ifel

.github/workflows/ci.yml

@@ -5,13 +5,15 @@ on:
     branches-ignore:
       - next
     paths-ignore:
+      - examples
       - Dockerfile.template
       - LICENSE
       - README.md
   push:
     branches-ignore:
       - next
     paths-ignore:
+      - examples
       - Dockerfile.template
       - LICENSE
       - README.md

.test/initdb.d/repluser.sql

@@ -42,18 +42,11 @@ die()
 }
 trap "killoff" EXIT
 
-if docker run --rm "$image" mariadb --version 2>/dev/null
-then
-	mariadb=mariadb
-	RPL_MONITOR="REPLICA MONITOR"
-	v=$(docker run --rm "$image" mariadb --version)
-	if [[ $v =~ Distrib\ 10.4 ]]; then
-		# the new age hasn't begun yet
-		RPL_MONITOR="REPLICATION CLIENT"
-	fi
-else
-	# still running 10.3
-	mariadb=mysql
+mariadb=mariadb
+RPL_MONITOR="REPLICA MONITOR"
+v=$(docker run --rm "$image" mariadb --version)
+if [[ $v =~ Distrib\ 10.4 ]]; then
+	# the new age hasn't begun yet
 	RPL_MONITOR="REPLICATION CLIENT"
 fi
 
@@ -685,6 +678,8 @@ fi
 		-e MARIADB_USER=bob \
 		-e MARIADB_PASSWORD=roger \
 		-e MARIADB_DATABASE=rabbit \
+		-e MARIADB_REPLICATION_USER="repluser" \
+		-e MARIADB_REPLICATION_PASSWORD="replpassword" \
 		"${image}" --log-bin --log-basename=my-mariadb
 	readarray -t vals < <(mariadbclient -u root --batch --skip-column-names -e 'show master status\G')
 	lastfile="${vals[1]}"
@@ -706,18 +701,18 @@ fi
 		-d \
 		--rm \
 		--name "$cname" \
-		-e MASTER_HOST="$master_host" \
+		-e MARIADB_MASTER_HOST="$master_host" \
+		-e MARIADB_REPLICATION_USER="repluser" \
+		-e MARIADB_REPLICATION_PASSWORD="replpassword" \
 		-e MARIADB_RANDOM_ROOT_PASSWORD=1 \
-		-e MARIADB_MYSQL_LOCALHOST_USER=1 \
-		-e MARIADB_MYSQL_LOCALHOST_GRANTS="REPLICATION CLIENT /*!100509 ,REPLICA MONITOR */" \
-		-v "${dir}"/replica-initdb.d/:/docker-entrypoint-initdb.d:Z \
+		-e MARIADB_HEALTHCHECK_GRANTS="${RPL_MONITOR}" \
 		--network=container:"$master_host" \
-		--health-cmd='healthcheck.sh --su-mysql --replication_io --replication_sql --replication_seconds_behind_master=0 --replication' \
+		--health-cmd='healthcheck.sh --replication_io --replication_sql --replication_seconds_behind_master=0 --replication' \
 		--health-interval=3s \
 		"$image" --server-id=2 --port 3307)
 
 	c="${DOCKER_LIBRARY_START_TIMEOUT:-10}"
-	until docker exec "$cid" healthcheck.sh --su-mysql --connect --replication_io --replication_sql --replication_seconds_behind_master=0 --replication || [ "$c" -eq 0 ]
+	until docker exec "$cid" healthcheck.sh --connect --replication_io --replication_sql --replication_seconds_behind_master=0 --replication || [ "$c" -eq 0 ]
 	do
 		sleep 1
 		c=$(( c - 1 ))
@@ -728,10 +723,6 @@ fi
 		cid=$cid_primary killoff
 		die "Table contents didn't match on replica"
 	fi
-	docker exec --user mysql -i \
-		"$cname" \
-		$mariadb \
-		-e "SHOW SLAVE STATUS\G"
 	killoff
 	cid=$master_host
 	killoff

.test/replica-initdb.d/change-master.sh

@@ -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.10.5" \
+      org.opencontainers.image.version="10.10.6" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:10.10.5+maria~ubu2204
+ARG MARIADB_VERSION=1:10.10.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-10.10.5/repo/ubuntu/ jammy main"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.10.6/repo/ubuntu/ jammy main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -116,7 +116,7 @@ RUN set -ex; \
 	rm -f /etc/mysql/mariadb.conf.d/rocksdb.cnf; \
 	rm -rf /var/lib/apt/lists/*; \
 # purge and re-create /var/lib/mysql with appropriate ownership
-	rm -rf /var/lib/mysql; \
+	rm -rf /var/lib/mysql /etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf; \
 	mkdir -p /var/lib/mysql /var/run/mysqld; \
 	chown -R mysql:mysql /var/lib/mysql /var/run/mysqld; \
 # ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime

.test/run.sh

@@ -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.4" \
+      org.opencontainers.image.version="10.11.5" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:10.11.4+maria~ubu2204
+ARG MARIADB_VERSION=1:10.11.5+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.4/repo/ubuntu/ jammy main"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.11.5/repo/ubuntu/ jammy main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -116,7 +116,7 @@ RUN set -ex; \
 	rm -f /etc/mysql/mariadb.conf.d/rocksdb.cnf; \
 	rm -rf /var/lib/apt/lists/*; \
 # purge and re-create /var/lib/mysql with appropriate ownership
-	rm -rf /var/lib/mysql; \
+	rm -rf /var/lib/mysql /etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf; \
 	mkdir -p /var/lib/mysql /var/run/mysqld; \
 	chown -R mysql:mysql /var/lib/mysql /var/run/mysqld; \
 # ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime

10.10/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.30" \
+      org.opencontainers.image.version="10.4.31" \
       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.30+maria~ubu2004
+ARG MARIADB_VERSION=1:10.4.31+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.30/repo/ubuntu/ focal main"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.4.31/repo/ubuntu/ focal main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -118,7 +118,7 @@ RUN set -ex; \
 	rm -f /etc/mysql/mariadb.conf.d/rocksdb.cnf; \
 	rm -rf /var/lib/apt/lists/*; \
 # purge and re-create /var/lib/mysql with appropriate ownership
-	rm -rf /var/lib/mysql; \
+	rm -rf /var/lib/mysql /etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf; \
 	mkdir -p /var/lib/mysql /var/run/mysqld; \
 	chown -R mysql:mysql /var/lib/mysql /var/run/mysqld; \
 # ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime

10.11/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.21" \
+      org.opencontainers.image.version="10.5.22" \
       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.21+maria~ubu2004
+ARG MARIADB_VERSION=1:10.5.22+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.21/repo/ubuntu/ focal main"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.5.22/repo/ubuntu/ focal main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -118,7 +118,7 @@ RUN set -ex; \
 	rm -f /etc/mysql/mariadb.conf.d/rocksdb.cnf; \
 	rm -rf /var/lib/apt/lists/*; \
 # purge and re-create /var/lib/mysql with appropriate ownership
-	rm -rf /var/lib/mysql; \
+	rm -rf /var/lib/mysql /etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf; \
 	mkdir -p /var/lib/mysql /var/run/mysqld; \
 	chown -R mysql:mysql /var/lib/mysql /var/run/mysqld; \
 # ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime

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.6.14" \
+      org.opencontainers.image.version="10.6.15" \
       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.14+maria~ubu2004
+ARG MARIADB_VERSION=1:10.6.15+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.14/repo/ubuntu/ focal main"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.6.15/repo/ubuntu/ focal main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -118,7 +118,7 @@ RUN set -ex; \
 	rm -f /etc/mysql/mariadb.conf.d/rocksdb.cnf; \
 	rm -rf /var/lib/apt/lists/*; \
 # purge and re-create /var/lib/mysql with appropriate ownership
-	rm -rf /var/lib/mysql; \
+	rm -rf /var/lib/mysql /etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf; \
 	mkdir -p /var/lib/mysql /var/run/mysqld; \
 	chown -R mysql:mysql /var/lib/mysql /var/run/mysqld; \
 # ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime

10.5/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.9.7" \
+      org.opencontainers.image.version="10.9.8" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:10.9.7+maria~ubu2204
+ARG MARIADB_VERSION=1:10.9.8+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-10.9.7/repo/ubuntu/ jammy main"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-10.9.8/repo/ubuntu/ jammy main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
@@ -116,7 +116,7 @@ RUN set -ex; \
 	rm -f /etc/mysql/mariadb.conf.d/rocksdb.cnf; \
 	rm -rf /var/lib/apt/lists/*; \
 # purge and re-create /var/lib/mysql with appropriate ownership
-	rm -rf /var/lib/mysql; \
+	rm -rf /var/lib/mysql /etc/mysql/mariadb.conf.d/50-mysqld_safe.cnf; \
 	mkdir -p /var/lib/mysql /var/run/mysqld; \
 	chown -R mysql:mysql /var/lib/mysql /var/run/mysqld; \
 # ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime