From a7e19d11dccfac72686aa3ddfb25b4c9342a412d Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 18 Mar 2022 21:03:38 +0000
Subject: [PATCH] 10.20.0-debian-10-r36 release

---
 bitnami/postgresql/10/debian-10/Dockerfile                    | 2 +-
 .../10/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh  | 4 ++--
 .../debian-10/rootfs/opt/bitnami/scripts/postgresql/setup.sh  | 1 -
 bitnami/postgresql/README.md                                  | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bitnami/postgresql/10/debian-10/Dockerfile b/bitnami/postgresql/10/debian-10/Dockerfile
index 0123badbcd9a..d2dc51d72573 100644
--- a/bitnami/postgresql/10/debian-10/Dockerfile
+++ b/bitnami/postgresql/10/debian-10/Dockerfile
@@ -27,7 +27,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="10.20.0-debian-10-r35" \
+    BITNAMI_IMAGE_VERSION="10.20.0-debian-10-r36" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql/10/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql/10/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
index f441662a0cf1..47418914c498 100644
--- a/bitnami/postgresql/10/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql/10/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -158,8 +158,6 @@ postgresql_validate() {
 postgresql_create_config() {
     info "postgresql.conf file not detected. Generating it..."
     cp "$POSTGRESQL_BASE_DIR/share/postgresql.conf.sample" "$POSTGRESQL_CONF_FILE"
-    # Configure port
-    postgresql_set_property "port" "$POSTGRESQL_PORT_NUMBER"
     # Update default value for 'include_dir' directive
     # ref: https://github.com/postgres/postgres/commit/fb9c475597c245562a28d1e916b575ac4ec5c19f#diff-f5544d9b6d218cc9677524b454b41c60
     if ! grep include_dir "$POSTGRESQL_CONF_FILE" >/dev/null; then
@@ -603,6 +601,8 @@ postgresql_initialize() {
     chmod go-rwx "$POSTGRESQL_DATA_DIR" || warn "Lack of permissions on data directory!"
 
     is_boolean_yes "$POSTGRESQL_ALLOW_REMOTE_CONNECTIONS" && is_boolean_yes "$create_pghba_file" && postgresql_create_pghba && postgresql_allow_local_connection
+    # Configure port
+    postgresql_set_property "port" "$POSTGRESQL_PORT_NUMBER"
 
     if ! is_dir_empty "$POSTGRESQL_DATA_DIR"; then
         info "Deploying PostgreSQL with persisted data..."
diff --git a/bitnami/postgresql/10/debian-10/rootfs/opt/bitnami/scripts/postgresql/setup.sh b/bitnami/postgresql/10/debian-10/rootfs/opt/bitnami/scripts/postgresql/setup.sh
index c88cb0dc6b18..a1b0e8ef4abc 100755
--- a/bitnami/postgresql/10/debian-10/rootfs/opt/bitnami/scripts/postgresql/setup.sh
+++ b/bitnami/postgresql/10/debian-10/rootfs/opt/bitnami/scripts/postgresql/setup.sh
@@ -38,7 +38,6 @@ postgresql_custom_init_scripts
 if ! postgresql_is_file_external "postgresql.conf" && is_boolean_yes "$POSTGRESQL_ALLOW_REMOTE_CONNECTIONS"; then
     info "Enabling remote connections"
     postgresql_enable_remote_connections
-    postgresql_set_property "port" "$POSTGRESQL_PORT_NUMBER"
 fi
 
 # Remove any pg_hba.conf lines that match the given filters
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index bb2fe0e78bf6..6b04a9b68195 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -54,7 +54,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 * [`13`, `13-debian-10`, `13.6.0`, `13.6.0-debian-10-r36` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.6.0-debian-10-r36/13/debian-10/Dockerfile)
 * [`12`, `12-debian-10`, `12.10.0`, `12.10.0-debian-10-r36` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.10.0-debian-10-r36/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.15.0`, `11.15.0-debian-10-r36` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.15.0-debian-10-r36/11/debian-10/Dockerfile)
-* [`10`, `10-debian-10`, `10.20.0`, `10.20.0-debian-10-r35` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.20.0-debian-10-r35/10/debian-10/Dockerfile)
+* [`10`, `10-debian-10`, `10.20.0`, `10.20.0-debian-10-r36` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.20.0-debian-10-r36/10/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).