From aeb35bdf001ae66d807ec035d38620538a06ae11 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Mon, 13 May 2019 13:06:39 +0000
Subject: [PATCH] 10.7.0-debian-9-r73 release

---
 bitnami/postgresql/10/debian-9/Dockerfile              | 2 +-
 bitnami/postgresql/10/debian-9/rootfs/libpostgresql.sh | 8 +++++++-
 bitnami/postgresql/README.md                           | 4 ++--
 bitnami/postgresql/docker-compose-replication.yml      | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bitnami/postgresql/10/debian-9/Dockerfile b/bitnami/postgresql/10/debian-9/Dockerfile
index 409e5d2e132e..79236bf6ac4f 100644
--- a/bitnami/postgresql/10/debian-9/Dockerfile
+++ b/bitnami/postgresql/10/debian-9/Dockerfile
@@ -16,7 +16,7 @@ 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="10.7.0-debian-9-r72" \
+    BITNAMI_IMAGE_VERSION="10.7.0-debian-9-r73" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NAMI_PREFIX="/.nami" \
diff --git a/bitnami/postgresql/10/debian-9/rootfs/libpostgresql.sh b/bitnami/postgresql/10/debian-9/rootfs/libpostgresql.sh
index 9ab58334ee78..ae3fbc0ef122 100644
--- a/bitnami/postgresql/10/debian-9/rootfs/libpostgresql.sh
+++ b/bitnami/postgresql/10/debian-9/rootfs/libpostgresql.sh
@@ -231,7 +231,13 @@ postgresql_validate() {
 postgresql_create_config() {
     info "postgresql.conf file not detected. Generating it..."
     cp "$POSTGRESQL_BASE_DIR/share/postgresql.conf.sample" "$POSTGRESQL_CONF_FILE"
-    sed -i 's/#include_dir/include_dir/g' "$POSTGRESQL_CONF_FILE"
+    # 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 
+        error "include_dir line is not present in $POSTGRESQL_CONF_FILE. This may be due to a changes in a new version of PostgreSQL. Please check"
+        exit 1
+    fi
+    sed -i -E "/#include_dir/i include_dir = 'conf.d'" "$POSTGRESQL_CONF_FILE"
 }
 
 ########################
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index 2df98b8fc47b..45bb70bca26c 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -46,9 +46,9 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 * [`11-ol-7`, `11.2.0-ol-7-r77` (11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.2.0-ol-7-r77/11/ol-7/Dockerfile)
 * [`11-debian-9`, `11.2.0-debian-9-r73`, `11`, `11.2.0`, `11.2.0-r73` (11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.2.0-debian-9-r73/11/debian-9/Dockerfile)
 * [`10-ol-7`, `10.7.0-ol-7-r78` (10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.7.0-ol-7-r78/10/ol-7/Dockerfile)
-* [`10-debian-9`, `10.7.0-debian-9-r72`, `10`, `10.7.0`, `10.7.0-r72`, `latest` (10/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.7.0-debian-9-r72/10/debian-9/Dockerfile)
+* [`10-debian-9`, `10.7.0-debian-9-r73`, `10`, `10.7.0`, `10.7.0-r73`, `latest` (10/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.7.0-debian-9-r73/10/debian-9/Dockerfile)
 * [`9.6-ol-7`, `9.6.12-ol-7-r78` (9.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.12-ol-7-r78/9.6/ol-7/Dockerfile)
-* [`9.6-debian-9`, `9.6.12-debian-9-r74`, `9.6`, `9.6.12`, `9.6.12-r74` (9.6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.12-debian-9-r74/9.6/debian-9/Dockerfile)
+* [`9.6-debian-9`, `9.6.12-debian-9-r73`, `9.6`, `9.6.12`, `9.6.12-r73` (9.6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.12-debian-9-r73/9.6/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).
 
diff --git a/bitnami/postgresql/docker-compose-replication.yml b/bitnami/postgresql/docker-compose-replication.yml
index bce3360c3901..510128c1caa3 100644
--- a/bitnami/postgresql/docker-compose-replication.yml
+++ b/bitnami/postgresql/docker-compose-replication.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   postgresql-master:
-    image: 'bitnami/postgresql:latest'
+    image: 'bitnami/postgresql:10'
     ports:
       - '5432'
     volumes:
@@ -15,7 +15,7 @@ services:
       - POSTGRESQL_PASSWORD=my_password
       - POSTGRESQL_DATABASE=my_database
   postgresql-slave:
-    image: 'bitnami/postgresql:latest'
+    image: 'bitnami/postgresql:10'
     ports:
       - '5432'
     depends_on: