From 0e5cb1e41cb6b319b7e25b4f7df206643b0fb2a7 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Wed, 16 Dec 2020 18:34:06 +0000
Subject: [PATCH] 2.4.46-debian-10-r115 release

---
 bitnami/apache/2.4/debian-10/Dockerfile                     | 2 +-
 .../2.4/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh  | 6 ++++--
 bitnami/apache/README.md                                    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bitnami/apache/2.4/debian-10/Dockerfile b/bitnami/apache/2.4/debian-10/Dockerfile
index 1ea9a5bc393d..affdbffc623c 100644
--- a/bitnami/apache/2.4/debian-10/Dockerfile
+++ b/bitnami/apache/2.4/debian-10/Dockerfile
@@ -22,7 +22,7 @@ ENV APACHE_ENABLE_CUSTOM_PORTS="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="apache" \
-    BITNAMI_IMAGE_VERSION="2.4.46-debian-10-r114" \
+    BITNAMI_IMAGE_VERSION="2.4.46-debian-10-r115" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/apache/bin:$PATH"
 
 EXPOSE 8080 8443
diff --git a/bitnami/apache/2.4/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/apache/2.4/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
index d658d7607277..4391dacc7853 100644
--- a/bitnami/apache/2.4/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh
+++ b/bitnami/apache/2.4/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/apache/README.md b/bitnami/apache/README.md
index 4febd65e9a58..69421fcf36af 100644
--- a/bitnami/apache/README.md
+++ b/bitnami/apache/README.md
@@ -45,7 +45,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.4`, `2.4-debian-10`, `2.4.46`, `2.4.46-debian-10-r114`, `latest` (2.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.46-debian-10-r114/2.4/debian-10/Dockerfile)
+* [`2.4`, `2.4-debian-10`, `2.4.46`, `2.4.46-debian-10-r115`, `latest` (2.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.46-debian-10-r115/2.4/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/apache GitHub repo](https://github.com/bitnami/bitnami-docker-apache).