From 9d3525d1e8ab1982d0ccbcb990324a6d885c1e21 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Wed, 8 Dec 2021 22:15:43 +0000
Subject: [PATCH] 1.16.1-debian-10-r25 release

---
 bitnami/pgbouncer/1/debian-10/Dockerfile                      | 2 +-
 .../1/debian-10/rootfs/opt/bitnami/scripts/pgbouncer-env.sh   | 4 ++++
 bitnami/pgbouncer/README.md                                   | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bitnami/pgbouncer/1/debian-10/Dockerfile b/bitnami/pgbouncer/1/debian-10/Dockerfile
index b3235882903a..55be904bc1ff 100644
--- a/bitnami/pgbouncer/1/debian-10/Dockerfile
+++ b/bitnami/pgbouncer/1/debian-10/Dockerfile
@@ -25,7 +25,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 RUN /opt/bitnami/scripts/pgbouncer/postunpack.sh
 ENV BITNAMI_APP_NAME="pgbouncer" \
-    BITNAMI_IMAGE_VERSION="1.16.1-debian-10-r24" \
+    BITNAMI_IMAGE_VERSION="1.16.1-debian-10-r25" \
     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-10/rootfs/opt/bitnami/scripts/pgbouncer-env.sh b/bitnami/pgbouncer/1/debian-10/rootfs/opt/bitnami/scripts/pgbouncer-env.sh
index 23fa3b78c479..64b58549c945 100644
--- a/bitnami/pgbouncer/1/debian-10/rootfs/opt/bitnami/scripts/pgbouncer-env.sh
+++ b/bitnami/pgbouncer/1/debian-10/rootfs/opt/bitnami/scripts/pgbouncer-env.sh
@@ -24,6 +24,8 @@ pgbouncer_env_vars=(
     PGBOUNCER_DATABASE
     PGBOUNCER_PORT
     PGBOUNCER_LISTEN_ADDRESS
+    PGBOUNCER_AUTH_USER
+    PGBOUNCER_AUTH_QUERY
     PGBOUNCER_AUTH_TYPE
     PGBOUNCER_POOL_MODE
     PGBOUNCER_INIT_SLEEP_TIME
@@ -88,6 +90,8 @@ export PGBOUNCER_INITSCRIPTS_DIR="/docker-entrypoint-initdb.d"
 export PGBOUNCER_DATABASE="${PGBOUNCER_DATABASE:-postgres}"
 export PGBOUNCER_PORT="${PGBOUNCER_PORT:-6432}"
 export PGBOUNCER_LISTEN_ADDRESS="${PGBOUNCER_LISTEN_ADDRESS:-0.0.0.0}"
+export PGBOUNCER_AUTH_USER="${PGBOUNCER_AUTH_USER:-}"
+export PGBOUNCER_AUTH_QUERY="${PGBOUNCER_AUTH_QUERY:-}"
 export PGBOUNCER_AUTH_TYPE="${PGBOUNCER_AUTH_TYPE:-md5}"
 export PGBOUNCER_POOL_MODE="${PGBOUNCER_POOL_MODE:-}"
 export PGBOUNCER_INIT_SLEEP_TIME="${PGBOUNCER_INIT_SLEEP_TIME:-10}"
diff --git a/bitnami/pgbouncer/README.md b/bitnami/pgbouncer/README.md
index 7184f5b0ef44..3340d42fcdc6 100644
--- a/bitnami/pgbouncer/README.md
+++ b/bitnami/pgbouncer/README.md
@@ -43,7 +43,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`1`, `1-debian-10`, `1.16.1`, `1.16.1-debian-10-r24`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgbouncer/blob/1.16.1-debian-10-r24/1/debian-10/Dockerfile)
+* [`1`, `1-debian-10`, `1.16.1`, `1.16.1-debian-10-r25`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgbouncer/blob/1.16.1-debian-10-r25/1/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/pgbouncer GitHub repo](https://github.com/bitnami/bitnami-docker-pgbouncer).
 
@@ -114,6 +114,8 @@ To expose the same database name as the backend, set `PGBOUNCER_DATABASE="$POSTG
 
 ### Other options
 
+- `PGBOUNCER_AUTH_USER`: PgBouncer will use this user to connect to the database and query the PostgreSQL backend for a user and password. No defaults.
+- `PGBOUNCER_AUTH_QUERY`: PgBouncer will use this query to connect to the database and query the PostgreSQL backend for a user and password. No defaults.
 - `PGBOUNCER_POOL_MODE` : PgBouncer pool mode. Allowed values: session, transaction and statement. Default: **session**.
 - `PGBOUNCER_INIT_SLEEP_TIME` : PgBouncer initialization sleep time. Default: **10**.
 - `PGBOUNCER_INIT_MAX_RETRIES` : PgBouncer initialization maximum retries. Default: **10**.