diff --git a/bitnami/joomla/4/debian-11/Dockerfile b/bitnami/joomla/4/debian-11/Dockerfile index 904f5de23e53..33b79d09f36c 100644 --- a/bitnami/joomla/4/debian-11/Dockerfile +++ b/bitnami/joomla/4/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-17T05:56:32Z" \ + org.opencontainers.image.created="2023-08-30T09:21:53Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.3.3-debian-11-r32" \ + org.opencontainers.image.ref.name="4.3.3-debian-11-r33" \ org.opencontainers.image.title="joomla" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.3.3" @@ -26,11 +26,11 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi7 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed6 libicu67 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libncurses6 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre2-8-0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline8 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp6 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 openssl procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "php-8.1.22-1-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-10-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.11.5-0-linux-${OS_ARCH}-debian-11" \ - "libphp-8.1.22-1-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.5-10-linux-${OS_ARCH}-debian-11" \ + "php-8.1.22-3-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.57-11-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.5-1-linux-${OS_ARCH}-debian-11" \ + "libphp-8.1.22-3-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.5-13-linux-${OS_ARCH}-debian-11" \ "joomla-4.3.3-1-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/joomla/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/joomla/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 11cf246bdff3..69eef8463a8f 100644 --- a/bitnami/joomla/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/joomla/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.57-10" + "version": "2.4.57-11" }, "joomla": { "arch": "amd64", @@ -15,24 +15,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.22-1" + "version": "8.1.22-3" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.11.5-0" + "version": "10.11.5-1" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.22-1" + "version": "8.1.22-3" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.5-10" + "version": "1.0.5-13" } } \ No newline at end of file diff --git a/bitnami/joomla/4/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/joomla/4/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh index 54987abca42a..16183f62d080 100644 --- a/bitnami/joomla/4/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/joomla/4/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/joomla/4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/joomla/4/debian-11/prebuildfs/usr/sbin/run-script new file mode 100755 index 000000000000..4ca0f897277e --- /dev/null +++ b/bitnami/joomla/4/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