From 72dbee099e5772dab3d632d45a24d55927b974c0 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Tue, 24 Aug 2021 04:11:58 +0000
Subject: [PATCH] 10.18.0-debian-10-r11 release

---
 bitnami/postgresql/10/debian-10/Dockerfile    |  2 +-
 .../prebuildfs/opt/bitnami/scripts/libfile.sh | 24 +++++++++++++++++--
 bitnami/postgresql/README.md                  |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/bitnami/postgresql/10/debian-10/Dockerfile b/bitnami/postgresql/10/debian-10/Dockerfile
index 2f7ab23b0b93..d88212db7590 100644
--- a/bitnami/postgresql/10/debian-10/Dockerfile
+++ b/bitnami/postgresql/10/debian-10/Dockerfile
@@ -22,7 +22,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.18.0-debian-10-r10" \
+    BITNAMI_IMAGE_VERSION="10.18.0-debian-10-r11" \
     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/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
index dd47f25e4e45..41ebaf7464f6 100644
--- a/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
+++ b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh
@@ -10,7 +10,7 @@
 # Functions
 
 ########################
-# Replace a regex in a file
+# Replace a regex-matching string in a file
 # Arguments:
 #   $1 - filename
 #   $2 - match regex
@@ -30,7 +30,7 @@ replace_in_file() {
     # We should avoid using 'sed in-place' substitutions
     # 1) They are not compatible with files mounted from ConfigMap(s)
     # 2) We found incompatibility issues with Debian10 and "in-place" substitutions
-    del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues
+    local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues
     if [[ $posix_regex = true ]]; then
         result="$(sed -E "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")"
     else
@@ -39,6 +39,26 @@ replace_in_file() {
     echo "$result" > "$filename"
 }
 
+########################
+# Replace a regex-matching multiline string in a file
+# Arguments:
+#   $1 - filename
+#   $2 - match regex
+#   $3 - substitute regex
+# Returns:
+#   None
+#########################
+replace_in_file_multiline() {
+    local filename="${1:?filename is required}"
+    local match_regex="${2:?match regex is required}"
+    local substitute_regex="${3:?substitute regex is required}"
+
+    local result
+    local -r del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues
+    result="$(perl -pe "BEGIN{undef $/;} s${del}${match_regex}${del}${substitute_regex}${del}sg" "$filename")"
+    echo "$result" > "$filename"
+}
+
 ########################
 # Remove a line in a file based on a regex
 # Arguments:
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index 696f700e57a6..05a6bed5f867 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
 * [`13`, `13-debian-10`, `13.4.0`, `13.4.0-debian-10-r10` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.4.0-debian-10-r10/13/debian-10/Dockerfile)
 * [`12`, `12-debian-10`, `12.8.0`, `12.8.0-debian-10-r10` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.8.0-debian-10-r10/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.13.0`, `11.13.0-debian-10-r10`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.13.0-debian-10-r10/11/debian-10/Dockerfile)
-* [`10`, `10-debian-10`, `10.18.0`, `10.18.0-debian-10-r10` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.18.0-debian-10-r10/10/debian-10/Dockerfile)
+* [`10`, `10-debian-10`, `10.18.0`, `10.18.0-debian-10-r11` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.18.0-debian-10-r11/10/debian-10/Dockerfile)
 * [`9.6`, `9.6-debian-10`, `9.6.23`, `9.6.23-debian-10-r10` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.23-debian-10-r10/9.6/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).