From 04e6c4689aac15b3687d7bb1e28cc3ac7ea50fed Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 20 Jul 2023 20:04:30 +0200 Subject: [PATCH] [bitnami/couchdb] Release 3.3.2-debian-11-r27 (#41544) Signed-off-by: Bitnami Containers --- bitnami/couchdb/3/debian-11/Dockerfile | 9 +++-- .../opt/bitnami/.bitnami_components.json | 2 +- .../opt/bitnami/scripts/libvalidations.sh | 40 ++++++++++++++++++- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/bitnami/couchdb/3/debian-11/Dockerfile b/bitnami/couchdb/3/debian-11/Dockerfile index 85cb99a07cab..f68093cfd531 100644 --- a/bitnami/couchdb/3/debian-11/Dockerfile +++ b/bitnami/couchdb/3/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-15T06:30:00Z" \ +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-07-19T17:44:32Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="3.3.2-debian-11-r24" \ + org.opencontainers.image.ref.name="3.3.2-debian-11-r27" \ org.opencontainers.image.title="couchdb" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="3.3.2" @@ -27,7 +28,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "wait-for-port-1.0.6-9-linux-${OS_ARCH}-debian-11" \ "ini-file-1.4.5-6-linux-${OS_ARCH}-debian-11" \ - "erlang-25.3.2-3-0-linux-${OS_ARCH}-debian-11" \ + "erlang-25.3.2-4-0-linux-${OS_ARCH}-debian-11" \ "couchdb-3.3.2-3-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 09e94a00c212..5e776bc68b2e 100644 --- a/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -9,7 +9,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "25.3.2-3-0" + "version": "25.3.2-4-0" }, "ini-file": { "arch": "amd64", diff --git a/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh index 3c6a4109c2c5..54987abca42a 100644 --- a/bitnami/couchdb/3/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/couchdb/3/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" } ########################