From 61c61cb5a9171585f987426ae53b11451f8d2f37 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 12 Jun 2020 04:18:57 +0000
Subject: [PATCH] 10.13.0-debian-10-r25 release

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

diff --git a/bitnami/postgresql/10/debian-10/Dockerfile b/bitnami/postgresql/10/debian-10/Dockerfile
index 558edb45850d..74d12462aed9 100644
--- a/bitnami/postgresql/10/debian-10/Dockerfile
+++ b/bitnami/postgresql/10/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="10.13.0-debian-10-r24" \
+    BITNAMI_IMAGE_VERSION="10.13.0-debian-10-r25" \
     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/libnet.sh b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
index f6380b714583..d658d7607277 100644
--- a/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
+++ b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
@@ -54,7 +54,17 @@ wait_for_dns_lookup() {
 #   Machine IP
 #########################
 get_machine_ip() {
-    dns_lookup "$(hostname)"
+    local -a ip_addresses
+    local hostname
+    hostname="$(hostname)"
+    read -r -a ip_addresses <<< "$(dns_lookup "$hostname" | xargs echo)"
+    if [[ "${#ip_addresses[@]}" -gt 1 ]]; then
+        warn "Found more than one IP address associated to hostname ${hostname}: ${ip_addresses[*]}, will use ${ip_addresses[0]}"
+    elif [[ "${#ip_addresses[@]}" -lt 1 ]]; then
+        error "Could not find any IP address associated to hostname ${hostname}"
+        exit 1
+    fi
+    echo "${ip_addresses[0]}"
 }
 
 ########################
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index 1f050fa6b51b..47799498a3a8 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -44,7 +44,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`12-debian-10`, `12.3.0-debian-10-r24`, `12`, `12.3.0` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.3.0-debian-10-r24/12/debian-10/Dockerfile)
 * [`11-debian-10`, `11.8.0-debian-10-r27`, `11`, `11.8.0`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.8.0-debian-10-r27/11/debian-10/Dockerfile)
-* [`10-debian-10`, `10.13.0-debian-10-r24`, `10`, `10.13.0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.13.0-debian-10-r24/10/debian-10/Dockerfile)
+* [`10-debian-10`, `10.13.0-debian-10-r25`, `10`, `10.13.0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.13.0-debian-10-r25/10/debian-10/Dockerfile)
 * [`9.6-debian-10`, `9.6.18-debian-10-r26`, `9.6`, `9.6.18` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.18-debian-10-r26/9.6/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).