From 9a9df52c0d360c423f5ce1b951b3d5973fbf0747 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 5 Oct 2022 11:35:03 +0200
Subject: [PATCH] [bitnami/pgpool] Release 4.3.3-debian-11-r15 (#8944)

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

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/pgpool/4/debian-11/Dockerfile         |  6 +++--
 .../opt/bitnami/scripts/libldapclient.sh      | 26 +++++++++----------
 bitnami/pgpool/README.md                      |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/bitnami/pgpool/4/debian-11/Dockerfile b/bitnami/pgpool/4/debian-11/Dockerfile
index b79927963615..e303287b6261 100644
--- a/bitnami/pgpool/4/debian-11/Dockerfile
+++ b/bitnami/pgpool/4/debian-11/Dockerfile
@@ -4,7 +4,7 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="4.3.3-debian-11-r14" \
+      org.opencontainers.image.ref.name="4.3.3-debian-11-r15" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/pgpool" \
       org.opencontainers.image.title="pgpool" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -51,7 +51,8 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     sha256sum -c gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
     tar -zxf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
     rm -rf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256
-RUN apt-get update && apt-get upgrade -y && \
+RUN apt-get autoremove --purge -y curl && \
+    apt-get update && apt-get upgrade -y && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
 
@@ -59,6 +60,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/pgpool/postunpack.sh
 ENV APP_VERSION="4.3.3" \
     BITNAMI_APP_NAME="pgpool" \
+    LD_LIBRARY_PATH="/opt/bitnami/common/lib/:/opt/bitnami/common/lib64/:$LD_LIBRARY_PATH" \
     PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/common/bin:/opt/bitnami/pgpool/bin:$PATH"
 
 EXPOSE 5432
diff --git a/bitnami/pgpool/4/debian-11/rootfs/opt/bitnami/scripts/libldapclient.sh b/bitnami/pgpool/4/debian-11/rootfs/opt/bitnami/scripts/libldapclient.sh
index a837c230a70c..21a2006e8fd6 100644
--- a/bitnami/pgpool/4/debian-11/rootfs/opt/bitnami/scripts/libldapclient.sh
+++ b/bitnami/pgpool/4/debian-11/rootfs/opt/bitnami/scripts/libldapclient.sh
@@ -56,9 +56,9 @@ EOF
 ldap_openldap_config_path() {
     local openldap_config
     case "$OS_FLAVOUR" in
-        debian-*|ubuntu-*) openldap_config=/etc/ldap/ldap.conf ;;
-        centos-*|photon-*) openldap_config=/etc/openldap/ldap.conf ;;
-        *) error "Unsupported OS flavor ${OS_FLAVOUR}" && exit 1 ;;
+    debian-* | ubuntu-*) openldap_config=/etc/ldap/ldap.conf ;;
+    centos-* | photon-* | redhatubi-*) openldap_config=/etc/openldap/ldap.conf ;;
+    *) error "Unsupported OS flavor ${OS_FLAVOUR}" && exit 1 ;;
     esac
     echo "$openldap_config"
 }
@@ -91,19 +91,19 @@ ldap_create_nslcd_config() {
     if am_i_root; then
         chown "root:${LDAP_NSLCD_GROUP}" "/etc/nslcd.conf"
         chown -R "${LDAP_NSLCD_USER}:${LDAP_NSLCD_GROUP}" "/var/run/nslcd"
-        cat > "/etc/nslcd.conf" <<EOF
+        cat >"/etc/nslcd.conf" <<EOF
 # The user and group nslcd should run as
 uid $LDAP_NSLCD_USER
 gid $LDAP_NSLCD_GROUP
 EOF
     else
-        cat > "/etc/nslcd.conf" <<EOF
+        cat >"/etc/nslcd.conf" <<EOF
 # Comment out uid,gid to avoid attempting change user/group to run as
 # uid
 # gid
 EOF
     fi
-    cat >> "/etc/nslcd.conf" <<EOF
+    cat >>"/etc/nslcd.conf" <<EOF
 nss_initgroups_ignoreusers $LDAP_NSS_INITGROUPS_IGNOREUSERS
 
 # The location at which the LDAP server(s) should be reachable.
@@ -115,30 +115,30 @@ binddn $LDAP_BIND_DN
 bindpw $LDAP_BIND_PASSWORD
 EOF
     if [[ -n "${LDAP_BASE_LOOKUP}" ]]; then
-        cat >>"/etc/nslcd.conf"<<EOF
+        cat >>"/etc/nslcd.conf" <<EOF
 base passwd $LDAP_BASE_LOOKUP
 EOF
     fi
     if [[ -n "${LDAP_SCOPE}" ]]; then
-        cat >>"/etc/nslcd.conf"<<EOF
+        cat >>"/etc/nslcd.conf" <<EOF
 # The search scope
 scope $LDAP_SCOPE
 EOF
     fi
     if [[ -n "${LDAP_SEARCH_FILTER}" ]]; then
-        cat >>"/etc/nslcd.conf"<<EOF
+        cat >>"/etc/nslcd.conf" <<EOF
 # LDAP search filter to use for posix users
 filter passwd (objectClass=$LDAP_SEARCH_FILTER)
 EOF
     fi
     if [[ -n "${LDAP_SEARCH_MAP}" ]]; then
-        cat >>"/etc/nslcd.conf"<<EOF
+        cat >>"/etc/nslcd.conf" <<EOF
 # Used for lookup of custom attributes
 map passwd uid $LDAP_SEARCH_MAP
 EOF
     fi
     if [[ -n "${LDAP_TLS_REQCERT}" ]]; then
-        cat >>"/etc/nslcd.conf"<<EOF
+        cat >>"/etc/nslcd.conf" <<EOF
 # TLS options
 tls_reqcert $LDAP_TLS_REQCERT
 EOF
@@ -158,7 +158,7 @@ EOF
 #   None
 #########################
 ldap_create_openldap_config() {
-    cat >>"$(ldap_openldap_config_path)"<<EOF
+    cat >>"$(ldap_openldap_config_path)" <<EOF
 BASE $LDAP_BASE
 URI $LDAP_URI
 
@@ -180,7 +180,7 @@ EOF
 #########################
 ldap_create_pam_config() {
     local filename="${1:?ip is missing}"
-    cat > "/etc/pam.d/${filename}" << EOF
+    cat >"/etc/pam.d/${filename}" <<EOF
 auth     required  pam_ldap.so  try_first_pass debug
 account  required  pam_ldap.so  debug
 EOF
diff --git a/bitnami/pgpool/README.md b/bitnami/pgpool/README.md
index 667ef3b62904..bb1cdf3fab98 100644
--- a/bitnami/pgpool/README.md
+++ b/bitnami/pgpool/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/).
 
 
-* [`4`, `4-debian-11`, `4.3.3`, `4.3.3-debian-11-r14`, `latest` (4/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/pgpool/4/debian-11/Dockerfile)
+* [`4`, `4-debian-11`, `4.3.3`, `4.3.3-debian-11-r15`, `latest` (4/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/pgpool/4/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).