[bitnami/mediawiki] Release 1.41.1-debian-12-r9 (#67621)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot 2024-06-06 14:23:13 +02:00 committed by GitHub
parent 58fd8dcdf4
commit b9e59b0a2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 23 additions and 17 deletions

View File

@ -7,11 +7,11 @@ ARG TARGETARCH
LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
org.opencontainers.image.created="2024-05-22T10:32:41Z" \
org.opencontainers.image.created="2024-06-06T11:10:39Z" \
org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mediawiki/README.md" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="1.41.1-debian-12-r8" \
org.opencontainers.image.ref.name="1.41.1-debian-12-r9" \
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mediawiki" \
org.opencontainers.image.title="mediawiki" \
org.opencontainers.image.vendor="Broadcom, Inc." \
@ -28,11 +28,11 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
RUN install_packages acl ca-certificates curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libexpat1 libffi8 libfftw3-double3 libfontconfig1 libfreetype6 libgcc-s1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhashkit2 libhogweed6 libicu72 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.5-0 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 libssl3 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libwebp7 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 libzstd1 openssl procps zlib1g
RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
COMPONENTS=( \
"render-template-1.0.6-13-linux-${OS_ARCH}-debian-12" \
"php-8.1.28-7-linux-${OS_ARCH}-debian-12" \
"render-template-1.0.6-14-linux-${OS_ARCH}-debian-12" \
"php-8.1.29-0-linux-${OS_ARCH}-debian-12" \
"apache-2.4.59-2-linux-${OS_ARCH}-debian-12" \
"mysql-client-11.3.2-3-linux-${OS_ARCH}-debian-12" \
"libphp-8.1.28-1-linux-${OS_ARCH}-debian-12" \
"libphp-8.1.29-0-linux-${OS_ARCH}-debian-12" \
"mediawiki-1.41.1-1-linux-${OS_ARCH}-debian-12" \
) ; \
for COMPONENT in "${COMPONENTS[@]}"; do \

View File

@ -9,7 +9,7 @@
"arch": "amd64",
"distro": "debian-12",
"type": "NAMI",
"version": "8.1.28-1"
"version": "8.1.29-0"
},
"mediawiki": {
"arch": "amd64",
@ -27,12 +27,12 @@
"arch": "amd64",
"distro": "debian-12",
"type": "NAMI",
"version": "8.1.28-7"
"version": "8.1.29-0"
},
"render-template": {
"arch": "amd64",
"distro": "debian-12",
"type": "NAMI",
"version": "1.0.6-13"
"version": "1.0.6-14"
}
}

View File

@ -327,14 +327,18 @@ mediawiki_configure_host() {
url="https://${host}"
[[ "$MEDIAWIKI_EXTERNAL_HTTPS_PORT_NUMBER" != "443" ]] && url+=":${MEDIAWIKI_EXTERNAL_HTTPS_PORT_NUMBER}"
else
url="http://${host}"
[[ "$MEDIAWIKI_EXTERNAL_HTTP_PORT_NUMBER" != "80" ]] && url+=":${MEDIAWIKI_EXTERNAL_HTTP_PORT_NUMBER}"
if [[ "$MEDIAWIKI_EXTERNAL_HTTP_PORT_NUMBER" != "80" || "$MEDIAWIKI_EXTERNAL_HTTPS_PORT_NUMBER" != "443" ]]; then
url="http://${host}"
[[ "$MEDIAWIKI_EXTERNAL_HTTP_PORT_NUMBER" != "80" ]] && url+=":${MEDIAWIKI_EXTERNAL_HTTP_PORT_NUMBER}"
else
# If using default values, support both HTTP and HTTPS at the same time
url="//${host}"
fi
fi
mediawiki_conf_set "\$wgServer" ""
# these keys aren't included in the default LocalSettings
mediawiki_conf_set "\$wgServer" "$url"
# this key isn't included in the default LocalSettings
cat >> "$MEDIAWIKI_CONF_FILE" <<EOF
\$wgCanonicalServer = "$url";
\$wgEnableCanonicalServerLink = true;
EOF
}

View File

@ -83,7 +83,7 @@ export MEDIAWIKI_DATA_TO_PERSIST="${MEDIAWIKI_DATA_TO_PERSIST:-images extensions
export MEDIAWIKI_SKIP_BOOTSTRAP="${MEDIAWIKI_SKIP_BOOTSTRAP:-}" # only used during the first initialization
export MEDIAWIKI_WIKI_NAME="${MEDIAWIKI_WIKI_NAME:-Bitnami MediaWiki}" # only used during the first initialization
export MEDIAWIKI_WIKI_PREFIX="${MEDIAWIKI_WIKI_PREFIX:-/wiki}" # only used during the first initialization
export MEDIAWIKI_SCRIPT_PATH="${MEDIAWIKI_SCRIPT_PATH:-/}" # only used during the first initialization
export MEDIAWIKI_SCRIPT_PATH="${MEDIAWIKI_SCRIPT_PATH:-}" # only used during the first initialization
export MEDIAWIKI_HOST="${MEDIAWIKI_HOST:-localhost}" # only used during the first initialization
export MEDIAWIKI_ENABLE_HTTPS="${MEDIAWIKI_ENABLE_HTTPS:-no}" # only used during the first initialization
export MEDIAWIKI_EXTERNAL_HTTP_PORT_NUMBER="${MEDIAWIKI_EXTERNAL_HTTP_PORT_NUMBER:-80}" # only used during the first initialization

View File

@ -32,10 +32,12 @@ fi
mediawiki_validate
# Update web server configuration with runtime environment (needs to happen before the initialization)
# Short URL config taken from https://www.mediawiki.org/wiki/Manual:Short_URL/wiki/Page_Title_--_.htaccess
ensure_web_server_app_configuration_exists "mediawiki" --type php --apache-extra-directory-configuration "
RewriteEngine On
RewriteRule ^/?${MEDIAWIKI_WIKI_PREFIX:1}(/.*)?$ %{DOCUMENT_ROOT}/index.php
RewriteRule ^/?${MEDIAWIKI_SCRIPT_PATH:1}(.*)$ %{DOCUMENT_ROOT}/\$1 [L]
RewriteRule ^${MEDIAWIKI_WIKI_PREFIX:1}/(.*)$ ${MEDIAWIKI_SCRIPT_PATH:1}/index.php?title=\$1 [PT,L,QSA]
RewriteRule ^${MEDIAWIKI_WIKI_PREFIX:1}/*$ ${MEDIAWIKI_SCRIPT_PATH:1}/index.php [L,QSA]
RewriteRule ^${MEDIAWIKI_WIKI_PREFIX:1}$ ${MEDIAWIKI_SCRIPT_PATH:1}/index.php [L,QSA]
"
web_server_update_app_configuration "mediawiki"

View File

@ -204,7 +204,7 @@ docker run -d --name mediawiki \
| `MEDIAWIKI_SKIP_BOOTSTRAP` | Whether to perform initial bootstrapping for the application. | `nil` |
| `MEDIAWIKI_WIKI_NAME` | MediaWiki wiki name. | `Bitnami MediaWiki` |
| `MEDIAWIKI_WIKI_PREFIX` | Base path to use for MediaWiki wiki URLs. | `/wiki` |
| `MEDIAWIKI_SCRIPT_PATH` | Base path to use for MediaWiki script URLs. | `/` |
| `MEDIAWIKI_SCRIPT_PATH` | Base path to use for MediaWiki script URLs. | `nil` |
| `MEDIAWIKI_HOST` | MediaWiki application host. | `localhost` |
| `MEDIAWIKI_ENABLE_HTTPS` | Whether to use HTTPS by default. | `no` |
| `MEDIAWIKI_EXTERNAL_HTTP_PORT_NUMBER` | Port to used by MediaWiki to generate URLs and links when accessing using HTTP. | `80` |