diff --git a/bitnami/mediawiki/1/debian-11/Dockerfile b/bitnami/mediawiki/1/debian-11/Dockerfile index af1b9a12174a..3a1f60253c36 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-02-21T08:21:20Z" \ + org.opencontainers.image.created="2023-02-22T23:24:03Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.39.1-debian-11-r22" \ + org.opencontainers.image.ref.name="1.39.2-debian-11-r0" \ org.opencontainers.image.title="mediawiki" \ org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.39.1" + org.opencontainers.image.version="1.39.2" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -27,7 +27,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ "mysql-client-10.6.12-1-linux-${OS_ARCH}-debian-11" \ "libphp-8.1.16-2-linux-${OS_ARCH}-debian-11" \ "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \ - "mediawiki-1.39.1-3-linux-${OS_ARCH}-debian-11" \ + "mediawiki-1.39.2-0-linux-${OS_ARCH}-debian-11" \ "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ @@ -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.1" \ + APP_VERSION="1.39.2" \ 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 92b71159c07e..22f4744caffc 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 @@ -22,10 +22,10 @@ }, "mediawiki": { "arch": "amd64", - "digest": "f87d80520cb54ea5163c87b2c02ddd392b6bc3c2790db9852cbfa282bfc3ea74", + "digest": "c9f5f200c15610f07b69fa391e7d3c7209ba6f7292f72e1d2ebe26dfa22de08c", "distro": "debian-11", "type": "NAMI", - "version": "1.39.1-3" + "version": "1.39.2-0" }, "mysql-client": { "arch": "amd64", 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 f964ab09fcba..af64e198ad2d 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 @@ -305,6 +305,8 @@ generate_systemd_conf() { local exec_reload="" local restart="always" local pid_file="" + local standard_output="journal" + local standard_error="" # Parse CLI flags shift while [[ "$#" -gt 0 ]]; do @@ -318,6 +320,8 @@ generate_systemd_conf() { | --exec-reload \ | --restart \ | --pid-file \ + | --standard-output \ + | --standard-error \ ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift @@ -362,36 +366,33 @@ ExecStart=${exec_start} EOF # Optional stop and reload commands if [[ -n "$exec_stop" ]]; then - cat >> "$service_file" <> "$service_file" <<< "ExecStop=${exec_stop}" fi if [[ -n "$exec_reload" ]]; then - cat >> "$service_file" <> "$service_file" <<< "ExecReload=${exec_reload}" fi # User and group if [[ -n "$user" ]]; then - cat >> "$service_file" <> "$service_file" <<< "User=${user}" fi if [[ -n "$group" ]]; then - cat >> "$service_file" <> "$service_file" <<< "Group=${group}" fi # PID file allows to determine if the main process is running properly (for Restart=always) if [[ -n "$pid_file" ]]; then - cat >> "$service_file" <> "$service_file" <<< "PIDFile=${pid_file}" fi # Environment flags (may be specified multiple times in a unit) if [[ -n "$environment" ]]; then cat >> "$service_file" <<< "$environment" fi + # Logging + if [[ -n "$standard_output" ]]; then + cat >> "$service_file" <<< "StandardOutput=${standard_output}" + fi + if [[ -n "$standard_error" ]]; then + cat >> "$service_file" <<< "StandardError=${standard_error}" + fi cat >> "$service_file" <