From 466a109367fbe73a5e33ab9f7a9cb84bb398e9c5 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 1 Apr 2023 15:31:48 +0200 Subject: [PATCH] [bitnami/mediawiki] Release 1.39.3-debian-11-r0 (#28856) Signed-off-by: Bitnami Containers --- bitnami/mediawiki/1/debian-11/Dockerfile | 22 +++++++++---------- .../opt/bitnami/.bitnami_components.json | 14 ++++++------ .../opt/bitnami/scripts/libservice.sh | 12 +++++++--- .../bitnami/scripts/mediawiki/updatehost.sh | 6 ++++- bitnami/mediawiki/1/debian-11/tags-info.yaml | 2 +- 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/bitnami/mediawiki/1/debian-11/Dockerfile b/bitnami/mediawiki/1/debian-11/Dockerfile index d3fa8790aed7..1a7383ad1578 100644 --- a/bitnami/mediawiki/1/debian-11/Dockerfile +++ b/bitnami/mediawiki/1/debian-11/Dockerfile @@ -3,13 +3,13 @@ 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-28T04:46:54Z" \ + org.opencontainers.image.created="2023-04-01T12:53:07Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.39.2-debian-11-r11" \ + org.opencontainers.image.ref.name="1.39.3-debian-11-r0" \ org.opencontainers.image.title="mediawiki" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.39.2" + org.opencontainers.image.version="1.39.3" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -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" \ - "mediawiki-1.39.2-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" \ + "mediawiki-1.39.3-0-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 \ @@ -52,7 +52,7 @@ RUN /opt/bitnami/scripts/mediawiki/postunpack.sh RUN /opt/bitnami/scripts/mysql-client/postunpack.sh ENV APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ - APP_VERSION="1.39.2" \ + APP_VERSION="1.39.3" \ BITNAMI_APP_NAME="mediawiki" \ PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH" diff --git a/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 3f6d341b5614..31d89ac33588 100644 --- a/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/mediawiki/1/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" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.17-1" + "version": "8.1.17-4" }, "mediawiki": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.39.2-1" + "version": "1.39.3-0" }, "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/mediawiki/1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 6fcb304d34cc..d70cf0779ec8 100644 --- a/bitnami/mediawiki/1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/mediawiki/1/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 diff --git a/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/mediawiki/updatehost.sh b/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/mediawiki/updatehost.sh index c86cfa09b675..24ff881ea14a 100755 --- a/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/mediawiki/updatehost.sh +++ b/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/mediawiki/updatehost.sh @@ -19,4 +19,8 @@ MEDIAWIKI_SERVER_HOST="${1:?missing host}" mediawiki_configure_host "$MEDIAWIKI_SERVER_HOST" # Reload PHP-FPM configuration to ensure that the home page redirects to the new domain -/opt/bitnami/scripts/php/reload.sh +if [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl reload bitnami.php-fpm.service +else + /opt/bitnami/scripts/php/reload.sh +fi diff --git a/bitnami/mediawiki/1/debian-11/tags-info.yaml b/bitnami/mediawiki/1/debian-11/tags-info.yaml index 6f2f14924c27..07243f647f18 100644 --- a/bitnami/mediawiki/1/debian-11/tags-info.yaml +++ b/bitnami/mediawiki/1/debian-11/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: - "1" - 1-debian-11 -- 1.39.2 +- 1.39.3 - latest