From 6eb42b9d107effb7725f2855069e683da1086d1d Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 14 Jan 2021 05:52:18 +0000
Subject: [PATCH] 11.10.0-debian-10-r61 release

---
 bitnami/postgresql/11/debian-10/Dockerfile                | 2 +-
 .../debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh | 3 ---
 .../rootfs/opt/bitnami/scripts/postgresql/postunpack.sh   | 4 ++--
 .../rootfs/opt/bitnami/scripts/postgresql/run-autoctl.sh  | 8 ++++----
 .../rootfs/opt/bitnami/scripts/postgresql/run.sh          | 4 ++--
 bitnami/postgresql/README.md                              | 2 +-
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/bitnami/postgresql/11/debian-10/Dockerfile b/bitnami/postgresql/11/debian-10/Dockerfile
index 52e8baf8effb..5097ae7f6609 100644
--- a/bitnami/postgresql/11/debian-10/Dockerfile
+++ b/bitnami/postgresql/11/debian-10/Dockerfile
@@ -24,7 +24,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/postgresql/postunpack.sh
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV BITNAMI_APP_NAME="postgresql" \
-    BITNAMI_IMAGE_VERSION="11.10.0-debian-10-r60" \
+    BITNAMI_IMAGE_VERSION="11.10.0-debian-10-r61" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
index 21babc244f00..7a5da689e54b 100644
--- a/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -794,9 +794,6 @@ postgresql_start_bg() {
         "${pg_ctl_cmd[@]}" "start" "${pg_ctl_flags[@]}" >/dev/null 2>&1
     fi
     local pg_isready_args=("-U" "postgres")
-    if [[ "$POSTGRESQL_PORT_NUMBER" != "5432" ]]; then
-        pg_isready_args+=("-p" "$POSTGRESQL_PORT_NUMBER")
-    fi
     local counter=$POSTGRESQL_INIT_MAX_TIMEOUT
     while ! "$POSTGRESQL_BIN_DIR"/pg_isready "${pg_isready_args[@]}" >/dev/null 2>&1; do
         sleep 1
diff --git a/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/postgresql/postunpack.sh b/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/postgresql/postunpack.sh
index 78b0788d23bf..f270af9c4ff0 100755
--- a/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/postgresql/postunpack.sh
+++ b/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/postgresql/postunpack.sh
@@ -9,7 +9,7 @@
 # Load PostgreSQL environment variables
 . /opt/bitnami/scripts/postgresql-env.sh
 
-for dir in "$POSTGRESQL_INITSCRIPTS_DIR" "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_CONF_DIR" "${POSTGRESQL_CONF_DIR}/conf.d" "${POSTGRESQL_MOUNTED_CONF_DIR}" "${POSTGRESQL_MOUNTED_CONF_DIR}/conf.d" "$POSTGRESQL_VOLUME_DIR"; do
+for dir in "$POSTGRESQL_INITSCRIPTS_DIR" "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_CONF_DIR" "${POSTGRESQL_CONF_DIR}/conf.d" "$POSTGRESQL_MOUNTED_CONF_DIR" "${POSTGRESQL_MOUNTED_CONF_DIR}/conf.d" "$POSTGRESQL_VOLUME_DIR"; do
     ensure_dir_exists "$dir"
 done
 
@@ -18,7 +18,7 @@ postgresql_allow_local_connection
 # Create basic postgresql.conf
 postgresql_create_config
 
-chmod -R g+rwX "$POSTGRESQL_INITSCRIPTS_DIR" "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_CONF_DIR" "${POSTGRESQL_CONF_DIR}/conf.d" "${POSTGRESQL_MOUNTED_CONF_DIR}" "${POSTGRESQL_MOUNTED_CONF_DIR}/conf.d" "$POSTGRESQL_VOLUME_DIR"
+chmod -R g+rwX "$POSTGRESQL_INITSCRIPTS_DIR" "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_CONF_DIR" "${POSTGRESQL_CONF_DIR}/conf.d" "$POSTGRESQL_MOUNTED_CONF_DIR" "${POSTGRESQL_MOUNTED_CONF_DIR}/conf.d" "$POSTGRESQL_VOLUME_DIR"
 
 # Redirect all logging to stdout
 ln -sf /dev/stdout "$POSTGRESQL_LOG_DIR/postgresql.log"
diff --git a/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/postgresql/run-autoctl.sh b/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/postgresql/run-autoctl.sh
index 9f0a50214e85..5adfc907c099 100755
--- a/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/postgresql/run-autoctl.sh
+++ b/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/postgresql/run-autoctl.sh
@@ -15,16 +15,16 @@ set -o pipefail
 # Load PostgreSQL environment variables
 . /opt/bitnami/scripts/postgresql-env.sh
 
-export HOME="${POSTGRESQL_AUTOCTL_VOLUME_DIR}"
+export HOME="$POSTGRESQL_AUTOCTL_VOLUME_DIR"
 
 autoctl_initialize
 
-flags=("run" "--pgdata" "${POSTGRESQL_DATA_DIR}")
+flags=("run" "--pgdata" "$POSTGRESQL_DATA_DIR")
 cmd=$(command -v pg_autoctl)
 
 info "** Starting PostgreSQL autoctl_node (Mode: $POSTGRESQL_AUTOCTL_MODE) **"
 if am_i_root; then
-    exec gosu "$POSTGRESQL_DAEMON_USER" "${cmd}" "${flags[@]}"
+    exec gosu "$POSTGRESQL_DAEMON_USER" "$cmd" "${flags[@]}"
 else
-    PGPASSWORD=${POSTGRESQL_REPLICATION_PASSWORD} exec "${cmd}" "${flags[@]}"
+    PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD exec "$cmd" "${flags[@]}"
 fi
diff --git a/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/postgresql/run.sh b/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/postgresql/run.sh
index 5d7a359d4a12..a84454655f70 100755
--- a/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/postgresql/run.sh
+++ b/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/postgresql/run.sh
@@ -19,7 +19,7 @@ cmd=$(command -v postgres)
 
 info "** Starting PostgreSQL **"
 if am_i_root; then
-    exec gosu "$POSTGRESQL_DAEMON_USER" "${cmd}" "${flags[@]}"
+    exec gosu "$POSTGRESQL_DAEMON_USER" "$cmd" "${flags[@]}"
 else
-    exec "${cmd}" "${flags[@]}"
+    exec "$cmd" "${flags[@]}"
 fi
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index d965c5ff166d..61b1525140d2 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -46,7 +46,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`13`, `13-debian-10`, `13.1.0`, `13.1.0-debian-10-r60` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.1.0-debian-10-r60/13/debian-10/Dockerfile)
 * [`12`, `12-debian-10`, `12.5.0`, `12.5.0-debian-10-r60` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.5.0-debian-10-r60/12/debian-10/Dockerfile)
-* [`11`, `11-debian-10`, `11.10.0`, `11.10.0-debian-10-r60`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.10.0-debian-10-r60/11/debian-10/Dockerfile)
+* [`11`, `11-debian-10`, `11.10.0`, `11.10.0-debian-10-r61`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.10.0-debian-10-r61/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.15.0`, `10.15.0-debian-10-r60` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.15.0-debian-10-r60/10/debian-10/Dockerfile)
 * [`9.6`, `9.6-debian-10`, `9.6.20`, `9.6.20-debian-10-r59` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.20-debian-10-r59/9.6/debian-10/Dockerfile)