From c74a5d38f23885f48bbe506b955dd5c0e5da74fb Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 12 Jun 2020 07:55:45 +0000
Subject: [PATCH] 2.4.6-debian-10-r1 release

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

diff --git a/bitnami/spark/2/debian-10/Dockerfile b/bitnami/spark/2/debian-10/Dockerfile
index 413fca2985c1..3a7c5c275506 100644
--- a/bitnami/spark/2/debian-10/Dockerfile
+++ b/bitnami/spark/2/debian-10/Dockerfile
@@ -20,7 +20,7 @@ RUN apt-get update && apt-get upgrade -y && \
 COPY rootfs /
 RUN /opt/bitnami/scripts/spark/postunpack.sh
 ENV BITNAMI_APP_NAME="spark" \
-    BITNAMI_IMAGE_VERSION="2.4.6-debian-10-r0" \
+    BITNAMI_IMAGE_VERSION="2.4.6-debian-10-r1" \
     JAVA_HOME="/opt/bitnami/java" \
     LD_LIBRARY_PATH="/opt/bitnami/python/lib/:/opt/bitnami/spark/venv/lib/python3.6/site-packages/numpy.libs/:$LD_LIBRARY_PATH" \
     LIBNSS_WRAPPER_PATH="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/spark/2/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/spark/2/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
index f6380b714583..d658d7607277 100644
--- a/bitnami/spark/2/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
+++ b/bitnami/spark/2/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/spark/README.md b/bitnami/spark/README.md
index c2e87a188316..9c755a4dd003 100644
--- a/bitnami/spark/README.md
+++ b/bitnami/spark/README.md
@@ -41,7 +41,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`2-debian-10`, `2.4.6-debian-10-r0`, `2`, `2.4.6`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spark/blob/2.4.6-debian-10-r0/2/debian-10/Dockerfile)
+* [`2-debian-10`, `2.4.6-debian-10-r1`, `2`, `2.4.6`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spark/blob/2.4.6-debian-10-r1/2/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/spark GitHub repo](https://github.com/bitnami/bitnami-docker-spark).