From 87a043a031e8c56ba66a0ad06e633417ae75ee1e Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Thu, 27 Feb 2025 17:24:00 +1100
Subject: [PATCH] main -> 12.0 for mariadb-operator

---
 main-ubi/Dockerfile           | 6 +++---
 main-ubi/docker-entrypoint.sh | 2 +-
 main/Dockerfile               | 6 +++---
 main/docker-entrypoint.sh     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/main-ubi/Dockerfile b/main-ubi/Dockerfile
index 01c9400..56c1db6 100644
--- a/main-ubi/Dockerfile
+++ b/main-ubi/Dockerfile
@@ -36,7 +36,7 @@ COPY MariaDB.repo /etc/yum.repos.d/
 # https://access.redhat.com/documentation/en-us/red_hat_software_certification/2024/html/red_hat_openshift_software_certification_policy_guide/assembly-requirements-for-container-images_openshift-sw-cert-policy-introduction#con-image-metadata-requirements_openshift-sw-cert-policy-container-images
 LABEL name="MariaDB Server" \
 	vendor="MariaDB Community" \
-	version="11.8.0" \
+	version="12.0.0" \
 	release="Refer to Annotations org.opencontainers.image.{revision,source}" \
 	summary="MariaDB Database" \
 	description="MariaDB Database for relational SQL"
@@ -50,11 +50,11 @@ 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.8.0" \
+      org.opencontainers.image.version="12.0.0" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=11.8.0
+ARG MARIADB_VERSION=12.0.0
 ENV MARIADB_VERSION=$MARIADB_VERSION
 # release-status:Alpha
 # release-support-type:Unknown
diff --git a/main-ubi/docker-entrypoint.sh b/main-ubi/docker-entrypoint.sh
index 9a64eb9..a476416 100755
--- a/main-ubi/docker-entrypoint.sh
+++ b/main-ubi/docker-entrypoint.sh
@@ -225,7 +225,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-	echo -n "11.8.0-MariaDB"
+	echo -n "12.0.0-MariaDB"
 }
 
 # initializes the database directory
diff --git a/main/Dockerfile b/main/Dockerfile
index 81e4833..139db13 100644
--- a/main/Dockerfile
+++ b/main/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.8.0" \
+      org.opencontainers.image.version="12.0.0" \
       org.opencontainers.image.url="https://github.com/MariaDB/mariadb-docker"
 
 # bashbrew-architectures: amd64 arm64v8 ppc64le s390x
-ARG MARIADB_VERSION=1:11.8.0+maria~ubu2404
+ARG MARIADB_VERSION=1:12.0.0+maria~ubu2404
 ENV MARIADB_VERSION $MARIADB_VERSION
 # release-status:Alpha
 # release-support-type:Unknown
 # (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.8.0/repo/ubuntu/ noble main main/debug"
+ARG REPOSITORY="http://archive.mariadb.org/mariadb-12.0.0/repo/ubuntu/ noble main main/debug"
 
 RUN set -e;\
 	echo "deb ${REPOSITORY}" > /etc/apt/sources.list.d/mariadb.list; \
diff --git a/main/docker-entrypoint.sh b/main/docker-entrypoint.sh
index 9a64eb9..a476416 100755
--- a/main/docker-entrypoint.sh
+++ b/main/docker-entrypoint.sh
@@ -225,7 +225,7 @@ docker_create_db_directories() {
 }
 
 _mariadb_version() {
-	echo -n "11.8.0-MariaDB"
+	echo -n "12.0.0-MariaDB"
 }
 
 # initializes the database directory