diff --git a/bitnami/git/2/debian-10/Dockerfile b/bitnami/git/2/debian-10/Dockerfile index 4f320dfbffcd..c06417b78423 100644 --- a/bitnami/git/2/debian-10/Dockerfile +++ b/bitnami/git/2/debian-10/Dockerfile @@ -9,13 +9,13 @@ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libc6 libcom-err2 libcurl4 libffi6 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libnettle6 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 procps ssh sudo tar zlib1g RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50 -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "git" "2.29.2-0" --checksum aebe650c294f00bacd383f90db2bbf5033dc32acc500d39fa66367f0118b7c9d +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "git" "2.29.2-1" --checksum 562c90f50c96c25edcaf718f585290f1a2fd9a45c7aa89ca05d6338583d3465e RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN /build/bitnami-user.sh ENV BITNAMI_APP_NAME="git" \ - BITNAMI_IMAGE_VERSION="2.29.2-debian-10-r44" \ + BITNAMI_IMAGE_VERSION="2.29.2-debian-10-r45" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/git/bin:$PATH" ENTRYPOINT [ "git" ] diff --git a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 94e42c682800..64c891bf7aee 100644 --- a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,10 +1,10 @@ { "git": { "arch": "amd64", - "digest": "aebe650c294f00bacd383f90db2bbf5033dc32acc500d39fa66367f0118b7c9d", + "digest": "562c90f50c96c25edcaf718f585290f1a2fd9a45c7aa89ca05d6338583d3465e", "distro": "debian-10", "type": "NAMI", - "version": "2.29.2-0" + "version": "2.29.2-1" }, "gosu": { "arch": "amd64", diff --git a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh index d658d7607277..4391dacc7853 100644 --- a/bitnami/git/2/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh +++ b/bitnami/git/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/git/README.md b/bitnami/git/README.md index eba9bf69607b..841bdab71585 100644 --- a/bitnami/git/README.md +++ b/bitnami/git/README.md @@ -28,7 +28,7 @@ $ docker run --name git bitnami/git:latest 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.29.2`, `2.29.2-debian-10-r44`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.29.2-debian-10-r44/2/debian-10/Dockerfile) +* [`2`, `2-debian-10`, `2.29.2`, `2.29.2-debian-10-r45`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-git/blob/2.29.2-debian-10-r45/2/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/git GitHub repo](https://github.com/bitnami/bitnami-docker-git).