From b19252264152d9fb978f0820c43f649f07c63bda Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Tue, 30 Sep 2025 11:32:33 +0200
Subject: [PATCH] [bitnami/pgbouncer] Release 1.24.1-debian-12-r12 (#86752)

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

diff --git a/bitnami/pgbouncer/1/debian-12/Dockerfile b/bitnami/pgbouncer/1/debian-12/Dockerfile
index 75b31f5dcfcd..43e00e3c203a 100644
--- a/bitnami/pgbouncer/1/debian-12/Dockerfile
+++ b/bitnami/pgbouncer/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:14:04Z" \
+      org.opencontainers.image.created="2025-09-30T09:17:21Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/pgbouncer/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/pgbouncer" \
@@ -31,7 +31,7 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
       "wait-for-port-1.0.10-1-linux-${OS_ARCH}-debian-12" \
       "postgresql-client-14.19.0-0-linux-${OS_ARCH}-debian-12" \
       "ini-file-1.4.9-1-linux-${OS_ARCH}-debian-12" \
-      "pgbouncer-1.24.1-0-linux-${OS_ARCH}-debian-12" \
+      "pgbouncer-1.24.1-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -49,17 +49,14 @@ 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
 RUN uninstall_packages curl
 
 COPY rootfs /
-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
 RUN /opt/bitnami/scripts/pgbouncer/postunpack.sh
 ENV APP_VERSION="1.24.1" \
     BITNAMI_APP_NAME="pgbouncer" \
-    IMAGE_REVISION="11" \
+    IMAGE_REVISION="12" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index 886962ebd276..a8293800d55c 100644
--- a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/pgbouncer/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/pgbouncer/README.md b/bitnami/pgbouncer/README.md
index 6a847d123ad4..17b33ae018ab 100644
--- a/bitnami/pgbouncer/README.md
+++ b/bitnami/pgbouncer/README.md
@@ -401,6 +401,12 @@ $ docker exec -it -u root debian-12-pgbouncer-1 psql -p 6432 -U postgres pg2 -c
   (1 row)
 ```
 
+### FIPS configuration in Bitnami Secure Images
+
+The Bitnami PgBouncer 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`.
+
 ## Using `docker-compose.yaml`
 
 Please be aware this file has not undergone internal testing. Consequently, we advise its use exclusively for development or testing purposes.