diff --git a/bitnami/pgbouncer/1/debian-11/Dockerfile b/bitnami/pgbouncer/1/debian-11/Dockerfile index f96ef3032f7d..27c9a8ff8d3e 100644 --- a/bitnami/pgbouncer/1/debian-11/Dockerfile +++ b/bitnami/pgbouncer/1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-12-06T09:33:12Z" \ + org.opencontainers.image.created="2024-01-05T09:55:38Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.21.0-debian-11-r6" \ + org.opencontainers.image.ref.name="1.21.0-debian-11-r7" \ org.opencontainers.image.title="pgbouncer" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.21.0" @@ -26,9 +26,9 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl libaudit1 libbsd0 libc-ares2 libcap-ng0 libedit2 libevent-2.1-7 libffi7 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu67 libidn2-0 libldap-2.4-2 liblzma5 libmd0 libnettle8 libp11-kit0 libpam0g libsasl2-2 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "wait-for-port-1.0.7-3-linux-${OS_ARCH}-debian-11" \ + "wait-for-port-1.0.7-4-linux-${OS_ARCH}-debian-11" \ "postgresql-client-14.10.0-0-linux-${OS_ARCH}-debian-11" \ - "ini-file-1.4.6-3-linux-${OS_ARCH}-debian-11" \ + "ini-file-1.4.6-4-linux-${OS_ARCH}-debian-11" \ "pgbouncer-1.21.0-1-linux-${OS_ARCH}-debian-11" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 22d29efe14bf..a35bde61c6ae 100644 --- a/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.4.6-3" + "version": "1.4.6-4" }, "pgbouncer": { "arch": "amd64", @@ -21,6 +21,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.7-3" + "version": "1.0.7-4" } } \ No newline at end of file diff --git a/bitnami/pgbouncer/1/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/pgbouncer/1/debian-11/prebuildfs/usr/sbin/run-script index b7a5bf1e50bf..4ca0f897277e 100755 --- a/bitnami/pgbouncer/1/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/pgbouncer/1/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-y}" +fail_if_not_present="${3:-n}" if test -f "$script"; then sh $script 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 58b361f8a943..2f52b7dbfb40 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 @@ -228,9 +228,6 @@ pgbouncer_initialize() { if ! is_empty_value "$PGBOUNCER_AUTH_USER"; then database_value+=" auth_user=$PGBOUNCER_AUTH_USER" fi - if ! is_empty_value "$PGBOUNCER_AUTH_DBNAME"; then - database_value+=" auth_dbname=$PGBOUNCER_AUTH_DBNAME" - fi if ! is_empty_value "$PGBOUNCER_CONNECT_QUERY"; then database_value+=" connect_query='${PGBOUNCER_CONNECT_QUERY}'" fi 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 31afc87f8164..e17b76121fb0 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 @@ -29,7 +29,6 @@ pgbouncer_env_vars=( PGBOUNCER_PORT PGBOUNCER_LISTEN_ADDRESS PGBOUNCER_AUTH_USER - PGBOUNCER_AUTH_DBNAME PGBOUNCER_AUTH_QUERY PGBOUNCER_AUTH_TYPE PGBOUNCER_AUTH_HBA_FILE @@ -121,7 +120,6 @@ 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_DBNAME="${PGBOUNCER_AUTH_DBNAME:-}" export PGBOUNCER_AUTH_QUERY="${PGBOUNCER_AUTH_QUERY:-}" export PGBOUNCER_AUTH_TYPE="${PGBOUNCER_AUTH_TYPE:-scram-sha-256}" export PGBOUNCER_AUTH_HBA_FILE="${PGBOUNCER_AUTH_HBA_FILE:-}" diff --git a/bitnami/pgbouncer/README.md b/bitnami/pgbouncer/README.md index 86d68b1a8ac3..514447bd9845 100644 --- a/bitnami/pgbouncer/README.md +++ b/bitnami/pgbouncer/README.md @@ -121,7 +121,6 @@ To expose a ["fallback database" (wildcard that matches any)](https://www.pgboun ### 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_DBNAME`: PgBouncer will use this user database for authentication purposes. 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_AUTH_TYPE`: PgBouncer authentication type. Default: **scram-sha-256** * `PGBOUNCER_AUTH_HBA_FILE`: HBA configuration file to use if auth_type is set to hba. No defaults.