From a5fda114a33aea8f96a4f455cdcf3127a778ea42 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Thu, 25 Jun 2020 10:39:47 +0000
Subject: [PATCH] 11.8.0-debian-10-r42 release

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

diff --git a/bitnami/postgresql/11/debian-10/Dockerfile b/bitnami/postgresql/11/debian-10/Dockerfile
index c3a1238a4c03..54e3e70d7c4b 100644
--- a/bitnami/postgresql/11/debian-10/Dockerfile
+++ b/bitnami/postgresql/11/debian-10/Dockerfile
@@ -22,7 +22,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
 COPY rootfs /
 RUN /opt/bitnami/scripts/postgresql/postunpack.sh
 ENV BITNAMI_APP_NAME="postgresql" \
-    BITNAMI_IMAGE_VERSION="11.8.0-debian-10-r41" \
+    BITNAMI_IMAGE_VERSION="11.8.0-debian-10-r42" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql/11/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/postgresql/11/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
index fab3aed61bd5..17309d011b4f 100644
--- a/bitnami/postgresql/11/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/postgresql/11/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -102,12 +102,28 @@ get_total_memory() {
 # Globals:
 #   None
 # Arguments:
-#   $1 - memory size (optional)
+#   None
+# Flags:
+#   --memory - memory size (optional)
 # Returns:
 #   Detected instance size
 #########################
 get_machine_size() {
-    local memory="${1:-}"
+    local memory=""
+    # Validate arguments
+    while [[ "$#" -gt 0 ]]; do
+        case "$1" in
+            --memory)
+                shift
+                memory="${1:?missing memory}"
+                ;;
+            *)
+                echo "Invalid command line flag $1" >&2
+                return 1
+                ;;
+        esac
+        shift
+    done
     if [[ -z "$memory" ]]; then
         debug "Memory was not specified, detecting available memory automatically"
         memory="$(get_total_memory)"
@@ -152,10 +168,10 @@ get_supported_machine_sizes() {
 #########################
 convert_to_mb() {
     local amount="${1:-}"
-    if [[ $amount =~ ^([0-9]+)(M|G) ]]; then
+    if [[ $amount =~ ^([0-9]+)(m|M|g|G) ]]; then
         size="${BASH_REMATCH[1]}"
         unit="${BASH_REMATCH[2]}"
-        if [[ "$unit" = "G" ]]; then
+        if [[ "$unit" = "g" || "$unit" = "G" ]]; then
            amount="$((size * 1024))"
         else
             amount="$size"
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index 83c4f17eaa39..4a8a0d5a1182 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -43,7 +43,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`12-debian-10`, `12.3.0-debian-10-r38`, `12`, `12.3.0` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.3.0-debian-10-r38/12/debian-10/Dockerfile)
-* [`11-debian-10`, `11.8.0-debian-10-r41`, `11`, `11.8.0`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.8.0-debian-10-r41/11/debian-10/Dockerfile)
+* [`11-debian-10`, `11.8.0-debian-10-r42`, `11`, `11.8.0`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.8.0-debian-10-r42/11/debian-10/Dockerfile)
 * [`10-debian-10`, `10.13.0-debian-10-r39`, `10`, `10.13.0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.13.0-debian-10-r39/10/debian-10/Dockerfile)
 * [`9.6-debian-10`, `9.6.18-debian-10-r40`, `9.6`, `9.6.18` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.18-debian-10-r40/9.6/debian-10/Dockerfile)