diff --git a/bitnami/apache/2.4/debian-10/Dockerfile b/bitnami/apache/2.4/debian-10/Dockerfile index 736d905d171b..4f8fe630654e 100644 --- a/bitnami/apache/2.4/debian-10/Dockerfile +++ b/bitnami/apache/2.4/debian-10/Dockerfile @@ -21,7 +21,7 @@ ENV APACHE_ENABLE_CUSTOM_PORTS="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="apache" \ - BITNAMI_IMAGE_VERSION="2.4.43-debian-10-r76" \ + BITNAMI_IMAGE_VERSION="2.4.43-debian-10-r77" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/apache/bin:$PATH" EXPOSE 8080 8443 diff --git a/bitnami/apache/2.4/debian-10/docker-compose.yml b/bitnami/apache/2.4/debian-10/docker-compose.yml index 26494d471631..32c54c589dfb 100644 --- a/bitnami/apache/2.4/debian-10/docker-compose.yml +++ b/bitnami/apache/2.4/debian-10/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: apache: - image: bitnami/apache:2.4 + image: docker.io/bitnami/apache:2.4-debian-10 ports: - 80:8080 - 443: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 f6380b714583..d658d7607277 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 @@ -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/apache/README.md b/bitnami/apache/README.md index 30b226a4793c..893663b91ff8 100644 --- a/bitnami/apache/README.md +++ b/bitnami/apache/README.md @@ -43,7 +43,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-debian-10`, `2.4.43-debian-10-r76`, `2.4`, `2.4.43`, `latest` (2.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.43-debian-10-r76/2.4/debian-10/Dockerfile) +* [`2.4-debian-10`, `2.4.43-debian-10-r77`, `2.4`, `2.4.43`, `latest` (2.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-apache/blob/2.4.43-debian-10-r77/2.4/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/apache GitHub repo](https://github.com/bitnami/bitnami-docker-apache). diff --git a/bitnami/apache/docker-compose.yml b/bitnami/apache/docker-compose.yml index 26494d471631..32c54c589dfb 100644 --- a/bitnami/apache/docker-compose.yml +++ b/bitnami/apache/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: apache: - image: bitnami/apache:2.4 + image: docker.io/bitnami/apache:2.4-debian-10 ports: - 80:8080 - 443:8443