diff --git a/bitnami/git/2/debian-11/Dockerfile b/bitnami/git/2/debian-11/Dockerfile index 1cbc48d7cdca..005a379f5a93 100644 --- a/bitnami/git/2/debian-11/Dockerfile +++ b/bitnami/git/2/debian-11/Dockerfile @@ -5,11 +5,12 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH -LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-07-17T10:17:09Z" \ +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-07-19T16:34:50Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.41.0-debian-11-r16" \ + org.opencontainers.image.ref.name="2.41.0-debian-11-r48" \ org.opencontainers.image.title="git" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.41.0" @@ -21,7 +22,7 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ COPY prebuildfs / SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages ca-certificates curl git-lfs less libbrotli1 libcom-err2 libcurl4 libffi7 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 procps zlib1g +RUN install_packages ca-certificates curl git-lfs less libbrotli1 libcom-err2 libcurl4 libffi7 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 procps ssh zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "git-2.41.0-2-linux-${OS_ARCH}-debian-11" \ @@ -39,8 +40,7 @@ RUN apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives COPY rootfs / -RUN install_packages ssh && \ - rm -f /etc/ssh/ssh_host_* > /dev/null 2>&1 && \ +RUN rm -f /etc/ssh/ssh_host_* > /dev/null 2>&1 && \ chmod g+w /etc/ssh ENV APP_VERSION="2.41.0" \ BITNAMI_APP_NAME="git" \ diff --git a/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh index 3c6a4109c2c5..54987abca42a 100644 --- a/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/git/2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -187,6 +187,25 @@ validate_port() { fi } +######################## +# Validate if the provided argument is a valid IPv6 address +# Arguments: +# $1 - IP to validate +# Returns: +# Boolean +######################### +validate_ipv6() { + local ip="${1:?ip is missing}" + local stat=1 + local full_address_regex='^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$' + local short_address_regex='^((([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6}::(([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6})$' + + if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then + stat=0 + fi + return "$stat" +} + ######################## # Validate if the provided argument is a valid IPv4 address # Arguments: @@ -204,7 +223,26 @@ validate_ipv4() { && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]] stat=$? fi - return $stat + return "$stat" +} + +######################## +# Validate if the provided argument is a valid IPv4 or IPv6 address +# Arguments: +# $1 - IP to validate +# Returns: +# Boolean +######################### +validate_ip() { + local ip="${1:?ip is missing}" + local stat=1 + + if validate_ipv4 "$ip"; then + stat=0 + else + stat=$(validate_ipv6 "$ip") + fi + return "$stat" } ########################