13.0 branch doesn't have mariadb-server-galera yet

Author: grooverdan

13.0-ubi/Dockerfile

@@ -93,7 +93,7 @@ RUN set -eux ; \
 	microdnf install --enablerepo=epel --disablerepo=mariadb --releasever=10.1 -y procps-ng zstd xz gzip tar jemalloc gperftools-libs pwgen pv util-linux-core ; \
 	mkdir -p /etc/mysql/conf.d /etc/mysql/mariadb.conf.d/ /var/lib/mysql/mysql /run/mariadb /usr/lib64/galera ; \
 	chmod ugo+rwx,o+t /run/mariadb ; \
-	microdnf install -y MariaDB-backup-${MARIADB_VERSION}  MariaDB-server-galera-${MARIADB_VERSION} ; \
+	microdnf install -y MariaDB-backup-${MARIADB_VERSION}  MariaDB-server-${MARIADB_VERSION} ; \
 	# compatibility with DEB Galera packaging
 	ln -s /usr/lib64/galera-4/libgalera_smm.so /usr/lib/libgalera_smm.so ; \
 	# compatibility with RPM Galera packaging

13.0/Dockerfile

@@ -112,7 +112,7 @@ RUN set -ex; \
 # postinst script creates a datadir, so avoid creating it by faking its existence.
 	mkdir -p /var/lib/mysql/mysql ; touch /var/lib/mysql/mysql/user.frm ; \
 # mariadb-backup is installed at the same time so that `mysql-common` is only installed once from just mariadb repos
-	apt-get install -y --no-install-recommends mariadb-server-galera="$MARIADB_VERSION" mariadb-backup socat \
+	apt-get install -y --no-install-recommends mariadb-server="$MARIADB_VERSION" mariadb-backup socat \
 	; \
 	rm -rf /var/lib/apt/lists/*; \
 # purge and re-create /var/lib/mysql with appropriate ownership

update.sh

@@ -156,6 +156,10 @@ ENV MARIADB_MAJOR $MARIADB_MAJOR
 			sed -i -e 's/-galera//' \
 				"$dir/Dockerfile"
 			;;
+		13.0*) # TMP main to 13.0 merge has't happened. Don't break quay.io builds
+			sed -i -e 's/-galera//' \
+				"$dir/Dockerfile"
+			;;
 		*)
 			;&
 	esac