From 7382397727587c3f28799078217e5337b1da0814 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Mon, 6 Oct 2025 22:34:49 +0200
Subject: [PATCH] [bitnami/mariadb-galera] Release 12.0.2-debian-12-r2 (#86893)

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
---
 bitnami/mariadb-galera/12.0/debian-12/Dockerfile          | 6 +++---
 .../prebuildfs/opt/bitnami/scripts/libservice.sh          | 8 ++++++--
 bitnami/mariadb-galera/README.md                          | 6 ++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/bitnami/mariadb-galera/12.0/debian-12/Dockerfile b/bitnami/mariadb-galera/12.0/debian-12/Dockerfile
index f3acdd471175..3004e16ba1b5 100644
--- a/bitnami/mariadb-galera/12.0/debian-12/Dockerfile
+++ b/bitnami/mariadb-galera/12.0/debian-12/Dockerfile
@@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-09-07T01:37:11Z" \
+      org.opencontainers.image.created="2025-10-06T20:22:33Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mariadb-galera/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mariadb-galera" \
@@ -29,7 +29,7 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
       "ini-file-1.4.9-1-linux-${OS_ARCH}-debian-12" \
-      "mariadb-galera-12.0.2-0-linux-${OS_ARCH}-debian-12" \
+      "mariadb-galera-12.0.2-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -51,7 +51,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/mariadb-galera/postunpack.sh
 ENV APP_VERSION="12.0.2" \
     BITNAMI_APP_NAME="mariadb-galera" \
-    IMAGE_REVISION="1" \
+    IMAGE_REVISION="2" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/mariadb/bin:/opt/bitnami/mariadb/sbin:/opt/bitnami/common/sbin:$PATH"
 
 EXPOSE 3306 4444 4567 4568
diff --git a/bitnami/mariadb-galera/12.0/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/mariadb-galera/12.0/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index 886962ebd276..a8293800d55c 100644
--- a/bitnami/mariadb-galera/12.0/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/mariadb-galera/12.0/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -259,6 +259,8 @@ generate_systemd_conf() {
     local success_exit_status=""
     local custom_service_content=""
     local working_directory=""
+    local timeout_start_sec="2min"
+    local timeout_stop_sec="30s"
     # Parse CLI flags
     shift
     while [[ "$#" -gt 0 ]]; do
@@ -277,6 +279,8 @@ generate_systemd_conf() {
             | --success-exit-status \
             | --custom-service-content \
             | --working-directory \
+            | --timeout-start-sec \
+            | --timeout-stop-sec \
             )
                 var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")"
                 shift
@@ -402,8 +406,8 @@ EOF
     fi
     cat >> "$service_file" <<EOF
 # Optimizations
-TimeoutStartSec=2min
-TimeoutStopSec=30s
+TimeoutStartSec=${timeout_start_sec}
+TimeoutStopSec=${timeout_stop_sec}
 IgnoreSIGPIPE=no
 KillMode=mixed
 EOF
diff --git a/bitnami/mariadb-galera/README.md b/bitnami/mariadb-galera/README.md
index 59d30f5c5969..38b0619e1280 100644
--- a/bitnami/mariadb-galera/README.md
+++ b/bitnami/mariadb-galera/README.md
@@ -619,6 +619,12 @@ docker run --name mariadb \
   bitnami/mariadb-galera:latest
 ```
 
+### FIPS configuration in Bitnami Secure Images
+
+The Bitnami MariaDB Galera Docker image from the [Bitnami Secure Images](https://www.arrow.com/globalecs/uk/products/bitnami-secure-images/) catalog includes extra features and settings to configure the container with FIPS capabilities. You can configure the next environment variables:
+
+- `OPENSSL_FIPS`: whether OpenSSL runs in FIPS mode or not. `yes` (default), `no`.
+
 ## Customize this image
 
 The Bitnami MariaDB Galera Docker image is designed to be extended so it can be used as the base image for your custom configuration.