From 83e4a46e645c993d945e7f201b937fc90927be5c Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Sat, 27 Sep 2025 08:52:20 +0200
Subject: [PATCH] [bitnami/cassandra] Release 5.0.5-debian-12-r9 (#86379)

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

diff --git a/bitnami/cassandra/5.0/debian-12/Dockerfile b/bitnami/cassandra/5.0/debian-12/Dockerfile
index 4f39d367de8d..d5096fb7d041 100644
--- a/bitnami/cassandra/5.0/debian-12/Dockerfile
+++ b/bitnami/cassandra/5.0/debian-12/Dockerfile
@@ -8,7 +8,7 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-09-07T00:25:29Z" \
+      org.opencontainers.image.created="2025-09-27T06:24:27Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/cassandra/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/cassandra" \
@@ -29,8 +29,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=( \
-      "python-3.11.13-9-linux-${OS_ARCH}-debian-12" \
-      "jre-11.0.28-12-0-linux-${OS_ARCH}-debian-12" \
+      "python-3.11.13-10-linux-${OS_ARCH}-debian-12" \
+      "jre-11.0.28-12-1-linux-${OS_ARCH}-debian-12" \
       "cassandra-5.0.5-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
@@ -55,7 +55,7 @@ RUN /opt/bitnami/scripts/cassandra/postunpack.sh
 RUN /opt/bitnami/scripts/java/postunpack.sh
 ENV APP_VERSION="5.0.5" \
     BITNAMI_APP_NAME="cassandra" \
-    IMAGE_REVISION="8" \
+    IMAGE_REVISION="9" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/python/bin:/opt/bitnami/java/bin:/opt/bitnami/cassandra/bin:$PATH"
 
diff --git a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index 886962ebd276..a8293800d55c 100644
--- a/bitnami/cassandra/5.0/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/cassandra/5.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/cassandra/README.md b/bitnami/cassandra/README.md
index d9bcb7d9da8b..4923902f226c 100644
--- a/bitnami/cassandra/README.md
+++ b/bitnami/cassandra/README.md
@@ -438,6 +438,12 @@ docker-compose restart cassandra
 
 Refer to the [configuration](http://docs.datastax.com/en/cassandra/3.x/cassandra/configuration/configTOC.html) manual for the complete list of configuration options.
 
+### FIPS configuration in Bitnami Secure Images
+
+The Bitnami Apache Cassandra 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`.
+
 ## TLS Encryption
 
 The Bitnami Apache Cassandra Docker image allows configuring TLS encryption between nodes and between server-client. This is done by mounting in `/bitnami/cassandra/secrets` two files: