From c41c300d4dae75e7aafa3e4e2c36c552a7029e9a Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Tue, 7 Oct 2025 04:05:35 +0200
Subject: [PATCH] [bitnami/memcached] Release 1.6.39-debian-12-r3 (#86931)

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

diff --git a/bitnami/memcached/1/debian-12/Dockerfile b/bitnami/memcached/1/debian-12/Dockerfile
index 3e6dda709214..c58786f08598 100644
--- a/bitnami/memcached/1/debian-12/Dockerfile
+++ b/bitnami/memcached/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-07T01:39:53Z" \
+      org.opencontainers.image.created="2025-10-07T01:57:57Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/memcached/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/memcached" \
@@ -51,7 +51,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/memcached/postunpack.sh
 ENV APP_VERSION="1.6.39" \
     BITNAMI_APP_NAME="memcached" \
-    IMAGE_REVISION="2" \
+    IMAGE_REVISION="3" \
     PATH="/opt/bitnami/memcached/bin:$PATH"
 
 EXPOSE 11211
diff --git a/bitnami/memcached/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/memcached/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index 886962ebd276..a8293800d55c 100644
--- a/bitnami/memcached/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/memcached/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/memcached/README.md b/bitnami/memcached/README.md
index 9017eb0151b6..a143b3ade7fa 100644
--- a/bitnami/memcached/README.md
+++ b/bitnami/memcached/README.md
@@ -317,6 +317,12 @@ sasldb_path: /opt/bitnami/memcached/conf/memcachedsasldb
 
 The `/opt/bitnami/memcached/conf/memcachedsasldb` is the path to the sasldb file that contains the list of Memcached users.
 
+### FIPS configuration in Bitnami Secure Images
+
+The Bitnami Memcached 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 Memcached Docker image sends the container logs to the `stdout`. To view the logs: