From 9910de9208d70ec84b4693dc4947803b3521bf1e Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Tue, 7 Oct 2025 05:25:33 +0200
Subject: [PATCH] [bitnami/opensearch] Release 3.2.0-debian-12-r2 (#86965)

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

diff --git a/bitnami/opensearch/3/debian-12/Dockerfile b/bitnami/opensearch/3/debian-12/Dockerfile
index f244e1aab7bc..6a1a09a47a9d 100644
--- a/bitnami/opensearch/3/debian-12/Dockerfile
+++ b/bitnami/opensearch/3/debian-12/Dockerfile
@@ -9,7 +9,7 @@ ARG OPENSEARCH_PLUGINS
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-09-07T02:10:23Z" \
+      org.opencontainers.image.created="2025-10-07T02:51:13Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/opensearch/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/opensearch" \
@@ -31,8 +31,8 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "yq-4.47.1-3-linux-${OS_ARCH}-debian-12" \
-      "jre-21.0.8-12-0-linux-${OS_ARCH}-debian-12" \
+      "yq-4.47.2-0-linux-${OS_ARCH}-debian-12" \
+      "jre-21.0.8-12-1-linux-${OS_ARCH}-debian-12" \
       "opensearch-3.2.0-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
@@ -54,7 +54,7 @@ RUN /opt/bitnami/scripts/opensearch/postunpack.sh
 RUN /opt/bitnami/scripts/java/postunpack.sh
 ENV APP_VERSION="3.2.0" \
     BITNAMI_APP_NAME="opensearch" \
-    IMAGE_REVISION="1" \
+    IMAGE_REVISION="2" \
     JAVA_HOME="/opt/bitnami/java" \
     LD_LIBRARY_PATH="/opt/bitnami/opensearch/jdk/lib:/opt/bitnami/opensearch/jdk/lib/server:/opt/bitnami/opensearch/plugins/opensearch-knn/lib:$LD_LIBRARY_PATH" \
     OPENSEARCH_JAVA_HOME="/opt/bitnami/java"
diff --git a/bitnami/opensearch/3/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/opensearch/3/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index 886962ebd276..a8293800d55c 100644
--- a/bitnami/opensearch/3/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/opensearch/3/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/opensearch/README.md b/bitnami/opensearch/README.md
index 9d83dda3cd9b..886697bff9ff 100644
--- a/bitnami/opensearch/README.md
+++ b/bitnami/opensearch/README.md
@@ -435,6 +435,12 @@ When the container is executed for the first time, it will execute the files wit
 
 In order to have your custom files inside the Docker image, you can mount them as a volume.
 
+### FIPS configuration in Bitnami Secure Images
+
+The Bitnami OpenSearch 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`.
+
 ## Logging
 
 The Bitnami OpenSearch Docker image sends the container logs to the `stdout`. To view the logs: