From 8c529be2e2f916f8bbed25ba1fadb660e4302b97 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 1 Apr 2023 13:53:37 +0200 Subject: [PATCH] [bitnami/joomla] Release 4.2.9-debian-11-r3 (#28806) Signed-off-by: Bitnami Containers --- bitnami/joomla/4/debian-11/Dockerfile | 18 +++++++++--------- .../opt/bitnami/.bitnami_components.json | 14 +++++++------- .../opt/bitnami/scripts/libservice.sh | 12 +++++++++--- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/bitnami/joomla/4/debian-11/Dockerfile b/bitnami/joomla/4/debian-11/Dockerfile index b2af2021d850..b30603e2e748 100644 --- a/bitnami/joomla/4/debian-11/Dockerfile +++ b/bitnami/joomla/4/debian-11/Dockerfile @@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-03-28T06:02:10Z" \ + org.opencontainers.image.created="2023-04-01T11:11:26Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.2.9-debian-11-r2" \ + org.opencontainers.image.ref.name="4.2.9-debian-11-r3" \ org.opencontainers.image.title="joomla" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.2.9" @@ -22,13 +22,13 @@ 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 procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "php-8.1.17-3-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.56-1-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.6.12-2-linux-${OS_ARCH}-debian-11" \ - "libphp-8.1.17-1-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.5-2-linux-${OS_ARCH}-debian-11" \ - "joomla-4.2.9-1-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ + "php-8.1.17-4-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.56-5-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.6.12-4-linux-${OS_ARCH}-debian-11" \ + "libphp-8.1.17-4-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.5-4-linux-${OS_ARCH}-debian-11" \ + "joomla-4.2.9-3-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ 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 a3b349bb129b..cbe81a5f5fa0 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,42 +3,42 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.56-1" + "version": "2.4.56-5" }, "gosu": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-3" + "version": "1.16.0-5" }, "joomla": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "4.2.9-1" + "version": "4.2.9-3" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.17-1" + "version": "8.1.17-4" }, "mysql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.6.12-2" + "version": "10.6.12-4" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.17-3" + "version": "8.1.17-4" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.5-2" + "version": "1.0.5-4" } } \ No newline at end of file diff --git a/bitnami/joomla/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/joomla/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 6fcb304d34cc..d70cf0779ec8 100644 --- a/bitnami/joomla/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/joomla/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -279,7 +279,7 @@ remove_logrotate_conf() { # Flags: # --custom-service-content - Custom content to add to the [service] block # --environment - Environment variable to define (multiple --environment options may be passed) -# --environment-file - Text file with environment variables +# --environment-file - Text file with environment variables (multiple --environment-file options may be passed) # --exec-start - Start command (required) # --exec-start-pre - Pre-start command (optional) # --exec-start-post - Post-start command (optional) @@ -330,7 +330,6 @@ generate_systemd_conf() { | --type \ | --user \ | --group \ - | --environment-file \ | --exec-start \ | --exec-stop \ | --exec-reload \ @@ -368,6 +367,12 @@ generate_systemd_conf() { [[ -n "$environment" ]] && environment+=$'\n' environment+="Environment=${1:?"--environment value is missing"}" ;; + --environment-file) + shift + # It is possible to add multiple environment-file lines + [[ -n "$environment_file" ]] && environment_file+=$'\n' + environment_file+="EnvironmentFile=${1:?"--environment-file value is missing"}" + ;; *) echo "Invalid command line flag ${1}" >&2 return 1 @@ -435,7 +440,8 @@ EOF cat >> "$service_file" <<< "$environment" fi if [[ -n "$environment_file" ]]; then - cat >> "$service_file" <<< "EnvironmentFile=${environment_file}" + # This variable may contain multiple EnvironmentFile= directives + cat >> "$service_file" <<< "$environment_file" fi # Logging if [[ -n "$standard_output" ]]; then