diff --git a/bitnami/drupal-nginx/10/debian-11/Dockerfile b/bitnami/drupal-nginx/10/debian-11/Dockerfile index 3dccb9117038..dfa61fee3483 100644 --- a/bitnami/drupal-nginx/10/debian-11/Dockerfile +++ b/bitnami/drupal-nginx/10/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-16T11:42:59Z" \ +LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-07-19T18:02:00Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.1.1-debian-11-r1" \ + org.opencontainers.image.ref.name="10.1.1-debian-11-r6" \ org.opencontainers.image.title="drupal-nginx" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="10.1.1" @@ -26,7 +27,7 @@ RUN install_packages acl ca-certificates curl gnupg libaudit1 libbrotli1 libbsd0 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "php-8.2.8-2-linux-${OS_ARCH}-debian-11" \ - "nginx-1.25.1-0-linux-${OS_ARCH}-debian-11" \ + "nginx-1.25.1-1-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.11.4-0-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.5-7-linux-${OS_ARCH}-debian-11" \ "drupal-10.1.1-0-linux-${OS_ARCH}-debian-11" \ diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 8ce4ff572d4d..909ae49326f5 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -15,7 +15,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.25.1-0" + "version": "1.25.1-1" }, "php": { "arch": "amd64", diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh index 3c6a4109c2c5..54987abca42a 100644 --- a/bitnami/drupal-nginx/10/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/drupal-nginx/10/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" } ########################