From 2944ebca58385bfb3f12a1cd482259e965ba4efb Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Tue, 29 Dec 2020 16:32:23 +0000
Subject: [PATCH] 2.7.0-debian-10-r10 release

---
 bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile        | 2 +-
 .../2/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh    | 6 ++++--
 .../prebuildfs/opt/bitnami/scripts/libwebserver.sh          | 1 -
 bitnami/spring-cloud-dataflow/README.md                     | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile b/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile
index fdd59b9bcaa4..3ae833da62f5 100644
--- a/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile
+++ b/bitnami/spring-cloud-dataflow/2/debian-10/Dockerfile
@@ -20,7 +20,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/spring-cloud-dataflow/postunpack.sh
 ENV BITNAMI_APP_NAME="spring-cloud-dataflow" \
-    BITNAMI_IMAGE_VERSION="2.7.0-debian-10-r9" \
+    BITNAMI_IMAGE_VERSION="2.7.0-debian-10-r10" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH"
 
 USER 1001
diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
index d658d7607277..4391dacc7853 100644
--- a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
+++ b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
@@ -10,15 +10,17 @@
 # Functions
 
 ########################
-# Resolve dns
+# Resolve IP address for a host/domain (i.e. DNS lookup)
 # Arguments:
 #   $1 - Hostname to resolve
+#   $2 - IP address version (v4, v6), leave empty for resolving to any version
 # Returns:
 #   IP
 #########################
 dns_lookup() {
     local host="${1:?host is missing}"
-    getent ahosts "$host" | awk '/STREAM/ {print $1 }'
+    local ip_version="${2:-}"
+    getent "ahosts${ip_version}" "$host" | awk '/STREAM/ {print $1 }' | head -n 1
 }
 
 #########################
diff --git a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 7fce9bb4a9a0..25bff4a05105 100644
--- a/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/spring-cloud-dataflow/2/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -153,7 +153,6 @@ web_server_restart() {
 #   None
 #########################
 web_server_reload() {
-    info "Reloading $(web_server_type) configuration"
     "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
 }
 
diff --git a/bitnami/spring-cloud-dataflow/README.md b/bitnami/spring-cloud-dataflow/README.md
index 4f53dc0ae4ac..2426119628ba 100644
--- a/bitnami/spring-cloud-dataflow/README.md
+++ b/bitnami/spring-cloud-dataflow/README.md
@@ -39,7 +39,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`, `2-debian-10`, `2.7.0`, `2.7.0-debian-10-r9`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow/blob/2.7.0-debian-10-r9/2/debian-10/Dockerfile)
+* [`2`, `2-debian-10`, `2.7.0`, `2.7.0-debian-10-r10`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow/blob/2.7.0-debian-10-r10/2/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/spring-cloud-dataflow GitHub repo](https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow).