From 5f7467c32ae7ab69476f3057111d14bf3758bfc3 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 20 Jul 2023 07:23:39 +0200 Subject: [PATCH] [bitnami/argo-cd] Release 2.7.8-debian-11-r0 (#41427) Signed-off-by: Bitnami Containers --- bitnami/argo-cd/2/debian-11/Dockerfile | 13 +++--- .../opt/bitnami/.bitnami_components.json | 2 +- .../opt/bitnami/scripts/libvalidations.sh | 40 ++++++++++++++++++- bitnami/argo-cd/2/debian-11/tags-info.yaml | 2 +- 4 files changed, 48 insertions(+), 9 deletions(-) diff --git a/bitnami/argo-cd/2/debian-11/Dockerfile b/bitnami/argo-cd/2/debian-11/Dockerfile index 121dccb39d3b..f39c1928ebb3 100644 --- a/bitnami/argo-cd/2/debian-11/Dockerfile +++ b/bitnami/argo-cd/2/debian-11/Dockerfile @@ -5,14 +5,15 @@ 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-16T23:25:03Z" \ +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-07-19T19:34:16Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.7.7-debian-11-r4" \ + org.opencontainers.image.ref.name="2.7.8-debian-11-r0" \ org.opencontainers.image.title="argo-cd" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="2.7.7" + org.opencontainers.image.version="2.7.8" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -25,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl git git-lfs gnupg openssh-client procps RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "argo-cd-2.7.7-1-linux-${OS_ARCH}-debian-11" \ + "argo-cd-2.7.8-0-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -43,7 +44,7 @@ RUN chmod g+rwX /opt/bitnami COPY rootfs / RUN /opt/bitnami/scripts/argo-cd/postunpack.sh -ENV APP_VERSION="2.7.7" \ +ENV APP_VERSION="2.7.8" \ BITNAMI_APP_NAME="argo-cd" \ PATH="/opt/bitnami/argo-cd/bin:/opt/bitnami/argo-cd/hack:/opt/bitnami/helm/bin:/opt/bitnami/ksonnet/bin:/opt/bitnami/kustomize/bin:$PATH" diff --git a/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 08a780e7ab94..978447eba2f4 100644 --- a/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,6 +3,6 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.7.7-1" + "version": "2.7.8-0" } } \ No newline at end of file diff --git a/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh index 3c6a4109c2c5..54987abca42a 100644 --- a/bitnami/argo-cd/2/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/argo-cd/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" } ######################## diff --git a/bitnami/argo-cd/2/debian-11/tags-info.yaml b/bitnami/argo-cd/2/debian-11/tags-info.yaml index 26f9aa8070e3..86657bfe8feb 100644 --- a/bitnami/argo-cd/2/debian-11/tags-info.yaml +++ b/bitnami/argo-cd/2/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "2" - 2-debian-11 -- 2.7.7 +- 2.7.8 - latest