From f520d9bef8dbce6dda3a1daad97532f027576272 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 13 Mar 2020 14:40:40 +0000
Subject: [PATCH] 9.6.17-debian-10-r30 release

---
 bitnami/postgresql/9.6/debian-10/Dockerfile          |  4 ++--
 bitnami/postgresql/9.6/debian-10/prebuildfs/libos.sh | 11 ++++++-----
 bitnami/postgresql/README.md                         |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/bitnami/postgresql/9.6/debian-10/Dockerfile b/bitnami/postgresql/9.6/debian-10/Dockerfile
index a0f19473dabd..49d30fc79b48 100644
--- a/bitnami/postgresql/9.6/debian-10/Dockerfile
+++ b/bitnami/postgresql/9.6/debian-10/Dockerfile
@@ -23,12 +23,12 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
 COPY rootfs /
 RUN /postunpack.sh
 ENV BITNAMI_APP_NAME="postgresql" \
-    BITNAMI_IMAGE_VERSION="9.6.17-debian-10-r29" \
+    BITNAMI_IMAGE_VERSION="9.6.17-debian-10-r30" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NAMI_PREFIX="/.nami" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
-    PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/gosu/bin:$PATH"
+    PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/common/bin:$PATH"
 
 VOLUME [ "/bitnami/postgresql", "/docker-entrypoint-initdb.d", "/docker-entrypoint-preinitdb.d" ]
 
diff --git a/bitnami/postgresql/9.6/debian-10/prebuildfs/libos.sh b/bitnami/postgresql/9.6/debian-10/prebuildfs/libos.sh
index 10022fb21d8d..041581ca0655 100644
--- a/bitnami/postgresql/9.6/debian-10/prebuildfs/libos.sh
+++ b/bitnami/postgresql/9.6/debian-10/prebuildfs/libos.sh
@@ -60,11 +60,12 @@ ensure_user_exists() {
     local group="${2:-}"
 
     if ! user_exists "$user"; then
-	useradd "$user" >/dev/null 2>&1
-        if [[ -n "$group" ]]; then
-            ensure_group_exists "$group"
-            usermod -a -G "$group" "$user" >/dev/null 2>&1
-        fi
+        useradd "$user" >/dev/null 2>&1
+    fi
+
+    if [[ -n "$group" ]]; then
+        ensure_group_exists "$group"
+        usermod -a -G "$group" "$user" >/dev/null 2>&1
     fi
 }
 
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index 8b8e12ac11f9..d0dadae47ec0 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -47,7 +47,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 * [`12-debian-10`, `12.2.0-debian-10-r29`, `12`, `12.2.0` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.2.0-debian-10-r29/12/debian-10/Dockerfile)
 * [`11-debian-10`, `11.7.0-debian-10-r27`, `11`, `11.7.0`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.7.0-debian-10-r27/11/debian-10/Dockerfile)
 * [`10-debian-10`, `10.12.0-debian-10-r28`, `10`, `10.12.0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.12.0-debian-10-r28/10/debian-10/Dockerfile)
-* [`9.6-debian-10`, `9.6.17-debian-10-r29`, `9.6`, `9.6.17` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.17-debian-10-r29/9.6/debian-10/Dockerfile)
+* [`9.6-debian-10`, `9.6.17-debian-10-r30`, `9.6`, `9.6.17` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.17-debian-10-r30/9.6/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).