From 01e5acd47b14c8ca03230958ee2721f5ed4a0710 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Sun, 29 Jan 2023 14:29:50 +0100
Subject: [PATCH] [bitnami/pgbouncer] Release 1.18.0-debian-11-r18 (#22127)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/pgbouncer/1/debian-11/Dockerfile      |  2 +-
 .../opt/bitnami/scripts/libpgbouncer.sh       |  6 ++--
 .../opt/bitnami/scripts/pgbouncer-env.sh      | 29 ++++++++++---------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/bitnami/pgbouncer/1/debian-11/Dockerfile b/bitnami/pgbouncer/1/debian-11/Dockerfile
index 5377171ae07b..fad0ca7e0c7e 100644
--- a/bitnami/pgbouncer/1/debian-11/Dockerfile
+++ b/bitnami/pgbouncer/1/debian-11/Dockerfile
@@ -5,7 +5,7 @@ ARG TARGETARCH
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.18.0-debian-11-r17" \
+      org.opencontainers.image.ref.name="1.18.0-debian-11-r18" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/pgbouncer" \
       org.opencontainers.image.title="pgbouncer" \
       org.opencontainers.image.vendor="VMware, Inc." \
diff --git a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh
index 0a46e33293e2..9d27fcf82670 100644
--- a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh
+++ b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh
@@ -207,9 +207,9 @@ pgbouncer_initialize() {
         fi
         ini-file set --section "databases" --key "$PGBOUNCER_DATABASE" --value "$database_value" "$PGBOUNCER_CONF_FILE"
 
-        i=0; 
-        while true; VAR_NAME="PGBOUNCER_DSN_${i}"; 
-        do 
+        i=0;
+        while true; VAR_NAME="PGBOUNCER_DSN_${i}";
+        do
             if [ -z "${!VAR_NAME+x}" ]; then
                 break;
             else
diff --git a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh
index 8f603cc76335..83c349698345 100644
--- a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh
+++ b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh
@@ -43,6 +43,7 @@ pgbouncer_env_vars=(
     PGBOUNCER_RESERVE_POOL_SIZE
     PGBOUNCER_IGNORE_STARTUP_PARAMETERS
     PGBOUNCER_EXTRA_FLAGS
+    PGBOUNCER_STATS_PERIOD
     PGBOUNCER_CLIENT_TLS_SSLMODE
     PGBOUNCER_CLIENT_TLS_CA_FILE
     PGBOUNCER_CLIENT_TLS_CERT_FILE
@@ -54,18 +55,6 @@ pgbouncer_env_vars=(
     PGBOUNCER_SERVER_TLS_KEY_FILE
     PGBOUNCER_SERVER_TLS_PROTOCOLS
     PGBOUNCER_SERVER_TLS_CIPHERS
-    POSTGRESQL_USERNAME
-    POSTGRESQL_PASSWORD
-    POSTGRESQL_DATABASE
-    POSTGRESQL_HOST
-    POSTGRESQL_PORT
-    PGBOUNCER_SET_DATABASE_USER
-    PGBOUNCER_SET_DATABASE_PASSWORD
-    PGBOUNCER_CONNECT_QUERY
-    PGBOUNCER_FORCE_INITSCRIPTS
-    PGBOUNCER_DAEMON_USER
-    PGBOUNCER_DAEMON_GROUP
-    PGBOUNCER_STATS_PERIOD
     PGBOUNCER_LOG_CONNECTIONS
     PGBOUNCER_LOG_DISCONNECTIONS
     PGBOUNCER_LOG_POOLER_ERRORS
@@ -77,6 +66,20 @@ pgbouncer_env_vars=(
     PGBOUNCER_AUTODB_IDLE_TIMEOUT
     PGBOUNCER_QUERY_TIMEOUT
     PGBOUNCER_CLIENT_IDLE_TIMEOUT
+    POSTGRESQL_USERNAME
+    POSTGRESQL_PASSWORD
+    POSTGRESQL_DATABASE
+    POSTGRESQL_HOST
+    POSTGRESQL_PORT
+    PGBOUNCER_SET_DATABASE_USER
+    PGBOUNCER_SET_DATABASE_PASSWORD
+    PGBOUNCER_CONNECT_QUERY
+    PGBOUNCER_FORCE_INITSCRIPTS
+    PGBOUNCER_SOCKET_DIR
+    PGBOUNCER_SOCKET_MODE
+    PGBOUNCER_SOCKET_GROUP
+    PGBOUNCER_DAEMON_USER
+    PGBOUNCER_DAEMON_GROUP
 )
 for env_var in "${pgbouncer_env_vars[@]}"; do
     file_env_var="${env_var}_FILE"
@@ -147,7 +150,7 @@ export PGBOUNCER_SERVER_TLS_CIPHERS="${PGBOUNCER_SERVER_TLS_CIPHERS:-fast}"
 export PGBOUNCER_LOG_CONNECTIONS="${PGBOUNCER_LOG_CONNECTIONS:-}"
 export PGBOUNCER_LOG_DISCONNECTIONS="${PGBOUNCER_LOG_DISCONNECTIONS:-}"
 export PGBOUNCER_LOG_POOLER_ERRORS="${PGBOUNCER_LOG_POOLER_ERRORS:-}"
-export PGBOUNCER_LOG_STATS="${PGBOUNCER_LOG_STATS:-1}"
+export PGBOUNCER_LOG_STATS="${PGBOUNCER_LOG_STATS:-}"
 
 # Timeout settings
 export PGBOUNCER_SERVER_LIFETIME="${PGBOUNCER_SERVER_LIFETIME:-}"