diff --git a/bitnami/mediawiki/1/debian-11/Dockerfile b/bitnami/mediawiki/1/debian-11/Dockerfile index 1be07737acac..b1c9871a4b63 100644 --- a/bitnami/mediawiki/1/debian-11/Dockerfile +++ b/bitnami/mediawiki/1/debian-11/Dockerfile @@ -2,11 +2,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-04-19T22:49:23Z" \ +LABEL com.vmware.cp.artifact.flavor="sha256:109c7d51bd69bb6b3df71017440c1ea0699454f81fe188056c083f0b57c96ea6" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-04-22T23:19:29Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.39.3-debian-11-r6" \ + org.opencontainers.image.ref.name="1.39.3-debian-11-r7" \ org.opencontainers.image.title="mediawiki" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.39.3" @@ -22,10 +23,10 @@ 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.18-0-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.57-4-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.6.12-4-linux-${OS_ARCH}-debian-11" \ - "libphp-8.1.18-0-linux-${OS_ARCH}-debian-11" \ + "php-8.1.18-1-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.57-5-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.11.2-5-linux-${OS_ARCH}-debian-11" \ + "libphp-8.1.18-2-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.5-5-linux-${OS_ARCH}-debian-11" \ "mediawiki-1.39.3-0-linux-${OS_ARCH}-debian-11" \ ) && \ 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 0bca36d5618f..8c19f00f059b 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,13 +3,13 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.57-4" + "version": "2.4.57-5" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.18-0" + "version": "8.1.18-2" }, "mediawiki": { "arch": "amd64", @@ -21,13 +21,13 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "10.6.12-4" + "version": "10.11.2-5" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.18-0" + "version": "8.1.18-1" }, "render-template": { "arch": "amd64", diff --git a/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl b/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl index 6d3b22894445..75a255c3efee 100644 --- a/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl +++ b/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl @@ -15,4 +15,3 @@ SetEnvIf X-Forwarded-Proto https HTTPS=on ErrorDocument 503 /503.html -Include "{{APACHE_CONF_DIR}}/bitnami/bitnami-ssl.conf" diff --git a/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh b/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh index bad7b1b943f5..131f5acba447 100755 --- a/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh +++ b/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/apache/setup.sh @@ -35,6 +35,10 @@ if [[ ! -f "${APACHE_CONF_DIR}/bitnami/certs/server.crt" ]]; then openssl x509 -req -sha256 -in "$SSL_CSR_FILE" -signkey "$SSL_KEY_FILE" -out "$SSL_CERT_FILE" -days 1825 -extfile <(echo -n "$SSL_EXT") rm -f "$SSL_CSR_FILE" fi +# Load SSL configuration +if [[ -f "${APACHE_CONF_DIR}/bitnami/bitnami.conf" ]] && [[ -f "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf" ]]; then + ensure_apache_configuration_exists "Include \"${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf\"" "bitnami-ssl\.conf" "${APACHE_CONF_DIR}/bitnami/bitnami.conf" +fi # Copy vhosts files if ! is_dir_empty "/vhosts"; then diff --git a/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/libapache.sh index 0aeb9a906755..f64a8b0b5e14 100644 --- a/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/libapache.sh +++ b/bitnami/mediawiki/1/debian-11/rootfs/opt/bitnami/scripts/libapache.sh @@ -237,18 +237,20 @@ is_apache_not_running() { # Arguments: # $1 - configuration string # $2 - pattern to use for checking if the configuration already exists (default: $1) +# $3 - Apache configuration file (default: $APACHE_CONF_FILE) # Returns: # None ######################## ensure_apache_configuration_exists() { local -r conf="${1:?conf missing}" local -r pattern="${2:-"$conf"}" + local -r conf_file="${3:-"$APACHE_CONF_FILE"}" # Enable configuration by appending to httpd.conf - if ! grep -E -q "$pattern" "$APACHE_CONF_FILE"; then - if is_file_writable "$APACHE_CONF_FILE"; then - cat >> "$APACHE_CONF_FILE" <<< "$conf" + if ! grep -E -q "$pattern" "$conf_file"; then + if is_file_writable "$conf_file"; then + cat >> "$conf_file" <<< "$conf" else - error "Could not add the following configuration to '${APACHE_CONF_FILE}:" + error "Could not add the following configuration to '${conf_file}:" error "" error "$(indent "$conf" 4)" error ""