diff --git a/bitnami/harbor-adapter-trivy/2/debian-10/Dockerfile b/bitnami/harbor-adapter-trivy/2/debian-10/Dockerfile index 8eacebce10d9..6d04f4a0650f 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-10/Dockerfile +++ b/bitnami/harbor-adapter-trivy/2/debian-10/Dockerfile @@ -18,7 +18,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/harbor-adapter-trivy/postunpack.sh ENV BITNAMI_APP_NAME="harbor-adapter-trivy" \ - BITNAMI_IMAGE_VERSION="2.1.2-debian-10-r11" \ + BITNAMI_IMAGE_VERSION="2.1.2-debian-10-r12" \ PATH="/opt/bitnami/harbor-adapter-trivy/bin:/opt/bitnami/common/bin:$PATH" WORKDIR /opt/bitnami/harbor-adapter-trivy diff --git a/bitnami/harbor-adapter-trivy/2/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/harbor-adapter-trivy/2/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh index d658d7607277..4391dacc7853 100644 --- a/bitnami/harbor-adapter-trivy/2/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh +++ b/bitnami/harbor-adapter-trivy/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/harbor-adapter-trivy/README.md b/bitnami/harbor-adapter-trivy/README.md index 76179f342cb2..d007deed8495 100644 --- a/bitnami/harbor-adapter-trivy/README.md +++ b/bitnami/harbor-adapter-trivy/README.md @@ -42,7 +42,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.1.2`, `2.1.2-debian-10-r11`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-adapter-trivy/blob/2.1.2-debian-10-r11/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.1.2`, `2.1.2-debian-10-r12`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-adapter-trivy/blob/2.1.2-debian-10-r12/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/harbor-adapter-trivy GitHub repo](https://github.com/bitnami/bitnami-docker-harbor-adapter-trivy).