From 63f390cadbd778efae6fbc213df2de0339e3765b Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Tue, 7 Oct 2025 05:01:26 +0200
Subject: [PATCH] [bitnami/rabbitmq] Release 4.1.4-debian-12-r2 (#86957)

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

diff --git a/bitnami/rabbitmq/4.1/debian-12/Dockerfile b/bitnami/rabbitmq/4.1/debian-12/Dockerfile
index 4a059f7a6487..cc398e6a45c2 100644
--- a/bitnami/rabbitmq/4.1/debian-12/Dockerfile
+++ b/bitnami/rabbitmq/4.1/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-07T02:30:00Z" \
+      org.opencontainers.image.created="2025-10-07T02:51:03Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq" \
@@ -48,16 +48,13 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
 RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \
     DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales && \
     echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen
+RUN /opt/bitnami/scripts/locales/generate-locales.sh
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/rabbitmq/postunpack.sh
-RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \
-    DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales && \
-    echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen
-RUN /opt/bitnami/scripts/locales/generate-locales.sh
 ENV APP_VERSION="4.1.4" \
     BITNAMI_APP_NAME="rabbitmq" \
-    IMAGE_REVISION="1" \
+    IMAGE_REVISION="2" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en"
 
diff --git a/bitnami/rabbitmq/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/rabbitmq/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index 886962ebd276..a8293800d55c 100644
--- a/bitnami/rabbitmq/4.1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/rabbitmq/4.1/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/rabbitmq/README.md b/bitnami/rabbitmq/README.md
index 6000bed0f02d..1e906c2e49e2 100644
--- a/bitnami/rabbitmq/README.md
+++ b/bitnami/rabbitmq/README.md
@@ -388,6 +388,12 @@ docker run -d --name rabbitmq-server \
 
 After that, your changes will be taken into account in the server's behaviour.
 
+### FIPS configuration in Bitnami Secure Images
+
+The Bitnami RabbitMQ 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`.
+
 ## Permission of SSL/TLS certificate and key files
 
 If you bind mount the certificate and key files from your local host to the container, make sure to set proper ownership and permissions of those files: