[bitnami/pgbouncer] Release 1.18.0-debian-11-r35 (#28983)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

bitnami/pgbouncer/1/debian-11/Dockerfile

@@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-03-28T07:00:05Z" \
+      org.opencontainers.image.created="2023-04-01T16:58:31Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.18.0-debian-11-r34" \
+      org.opencontainers.image.ref.name="1.18.0-debian-11-r35" \
       org.opencontainers.image.title="pgbouncer" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.18.0"
@@ -22,11 +22,11 @@ SHELL ["/bin/bash", "-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.6-2-linux-${OS_ARCH}-debian-11" \
-      "postgresql-client-14.7.0-2-linux-${OS_ARCH}-debian-11" \
-      "ini-file-1.4.5-2-linux-${OS_ARCH}-debian-11" \
-      "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \
-      "pgbouncer-1.18.0-4-linux-${OS_ARCH}-debian-11" \
+      "wait-for-port-1.0.6-4-linux-${OS_ARCH}-debian-11" \
+      "postgresql-client-14.7.0-4-linux-${OS_ARCH}-debian-11" \
+      "ini-file-1.4.5-4-linux-${OS_ARCH}-debian-11" \
+      "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \
+      "pgbouncer-1.18.0-6-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \

bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json

@@ -3,30 +3,30 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.16.0-3"
+        "version": "1.16.0-5"
     },
     "ini-file": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.4.5-2"
+        "version": "1.4.5-4"
     },
     "pgbouncer": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.18.0-4"
+        "version": "1.18.0-6"
     },
     "postgresql-client": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "14.7.0-2"
+        "version": "14.7.0-4"
     },
     "wait-for-port": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.0.6-2"
+        "version": "1.0.6-4"
     }
 }

bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh

@@ -279,7 +279,7 @@ remove_logrotate_conf() {
 # Flags:
 #   --custom-service-content - Custom content to add to the [service] block
 #   --environment - Environment variable to define (multiple --environment options may be passed)
-#   --environment-file - Text file with environment variables
+#   --environment-file - Text file with environment variables (multiple --environment-file options may be passed)
 #   --exec-start - Start command (required)
 #   --exec-start-pre - Pre-start command (optional)
 #   --exec-start-post - Post-start command (optional)
@@ -330,7 +330,6 @@ generate_systemd_conf() {
             | --type \
             | --user \
             | --group \
-            | --environment-file \
             | --exec-start \
             | --exec-stop \
             | --exec-reload \
@@ -368,6 +367,12 @@ generate_systemd_conf() {
                 [[ -n "$environment" ]] && environment+=$'\n'
                 environment+="Environment=${1:?"--environment value is missing"}"
                 ;;
+            --environment-file)
+                shift
+                # It is possible to add multiple environment-file lines
+                [[ -n "$environment_file" ]] && environment_file+=$'\n'
+                environment_file+="EnvironmentFile=${1:?"--environment-file value is missing"}"
+                ;;
             *)
                 echo "Invalid command line flag ${1}" >&2
                 return 1
@@ -435,7 +440,8 @@ EOF
         cat >> "$service_file" <<< "$environment"
     fi
     if [[ -n "$environment_file" ]]; then
-        cat >> "$service_file" <<< "EnvironmentFile=${environment_file}"
+        # This variable may contain multiple EnvironmentFile= directives
+        cat >> "$service_file" <<< "$environment_file"
     fi
     # Logging
     if [[ -n "$standard_output" ]]; then