From 8e60f47b23a60d5a51125ded3b4e10cc22046273 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 5 Nov 2020 22:31:05 +0000
Subject: [PATCH] 9.6.19-debian-10-r84 release

---
 bitnami/postgresql/9.6/debian-10/Dockerfile                | 2 +-
 .../debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh  | 7 ++++++-
 bitnami/postgresql/README.md                               | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bitnami/postgresql/9.6/debian-10/Dockerfile b/bitnami/postgresql/9.6/debian-10/Dockerfile
index fd232c83e42b..f967c6d618be 100644
--- a/bitnami/postgresql/9.6/debian-10/Dockerfile
+++ b/bitnami/postgresql/9.6/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="9.6.19-debian-10-r83" \
+    BITNAMI_IMAGE_VERSION="9.6.19-debian-10-r84" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
index 3d5090bad88a..33d2e50880e4 100644
--- a/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql/9.6/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -708,9 +708,14 @@ postgresql_custom_init_scripts() {
 #   None
 #########################
 postgresql_stop() {
+    local -r -a cmd=("pg_ctl" "stop" "-w" "-D" "$POSTGRESQL_DATA_DIR")
     if [[ -f "$POSTGRESQL_PID_FILE" ]]; then
         info "Stopping PostgreSQL..."
-        PGDATA="$POSTGRESQL_DATA_DIR" pg_ctl stop -w
+        if am_i_root; then
+          gosu "$POSTGRESQL_DAEMON_USER" "${cmd[@]}"
+        else
+          "${cmd[@]}"
+        fi
     fi
 }
 
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index c04f05fdf003..18f53cf4b2ac 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -48,7 +48,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 * [`12`, `12-debian-10`, `12.4.0`, `12.4.0-debian-10-r82` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.4.0-debian-10-r82/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.9.0`, `11.9.0-debian-10-r74`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.9.0-debian-10-r74/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.14.0`, `10.14.0-debian-10-r83` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.14.0-debian-10-r83/10/debian-10/Dockerfile)
-* [`9.6`, `9.6-debian-10`, `9.6.19`, `9.6.19-debian-10-r83` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.19-debian-10-r83/9.6/debian-10/Dockerfile)
+* [`9.6`, `9.6-debian-10`, `9.6.19`, `9.6.19-debian-10-r84` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.19-debian-10-r84/9.6/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).