diff --git a/bitnami/drupal-nginx/10/debian-11/Dockerfile b/bitnami/drupal-nginx/10/debian-11/Dockerfile index fb2058822506..279091da7df2 100644 --- a/bitnami/drupal-nginx/10/debian-11/Dockerfile +++ b/bitnami/drupal-nginx/10/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-08-27T19:35:36Z" \ + org.opencontainers.image.created="2023-08-30T02:46:37Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="10.1.2-debian-11-r24" \ + org.opencontainers.image.ref.name="10.1.2-debian-11-r26" \ org.opencontainers.image.title="drupal-nginx" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="10.1.2" @@ -30,7 +30,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ "nginx-1.25.2-1-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.5-13-linux-${OS_ARCH}-debian-11" \ - "drupal-10.1.2-1-linux-${OS_ARCH}-debian-11" \ + "drupal-10.1.2-2-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ 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 6bd0e8607f46..25f6a983ea4d 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 @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.1.2-1" + "version": "10.1.2-2" }, "mysql-client": { "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 54987abca42a..16183f62d080 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 @@ -4,7 +4,7 @@ # # Validation functions library -# shellcheck disable=SC1091 +# shellcheck disable=SC1091,SC2086 # Load Generic Libraries . /opt/bitnami/scripts/liblog.sh @@ -203,7 +203,7 @@ validate_ipv6() { if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then stat=0 fi - return "$stat" + return $stat } ######################## @@ -223,7 +223,7 @@ validate_ipv4() { && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]] stat=$? fi - return "$stat" + return $stat } ######################## @@ -242,7 +242,7 @@ validate_ip() { else stat=$(validate_ipv6 "$ip") fi - return "$stat" + return $stat } ######################## diff --git a/bitnami/drupal-nginx/10/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/drupal-nginx/10/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 000000000000..4ca0f897277e --- /dev/null +++ b/bitnami/drupal-nginx/10/debian-11/prebuildfs/usr/sbin/run-script @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright VMware, Inc. +# SPDX-License-Identifier: APACHE-2.0 +set -u + +if [ $# -eq 0 ]; then + >&2 echo "No arguments provided" + exit 1 +fi + +script=$1 +exit_code="${2:-96}" +fail_if_not_present="${3:-n}" + +if test -f "$script"; then + sh $script + + if [ $? -ne 0 ]; then + exit $((exit_code)) + fi +elif [ "$fail_if_not_present" = "y" ]; then + >&2 echo "script not found: $script" + exit 127 +fi