From 11cee91f426363eb6af2904be3da495ae0f32ea9 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 11 Apr 2023 04:06:13 +0200 Subject: [PATCH] [bitnami/dokuwiki] Release 20220731.1.0-debian-11-r70 (#29948) Signed-off-by: Bitnami Containers --- .../dokuwiki/20220731/debian-11/Dockerfile | 14 +++++------ .../opt/bitnami/.bitnami_components.json | 16 ++++--------- .../opt/bitnami/scripts/libservice.sh | 14 +++++++---- .../opt/bitnami/scripts/libwebserver.sh | 24 +++++++++++++++---- 4 files changed, 42 insertions(+), 26 deletions(-) diff --git a/bitnami/dokuwiki/20220731/debian-11/Dockerfile b/bitnami/dokuwiki/20220731/debian-11/Dockerfile index bbdbc7516441..537b7c2ccfbe 100644 --- a/bitnami/dokuwiki/20220731/debian-11/Dockerfile +++ b/bitnami/dokuwiki/20220731/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-21T21:59:05Z" \ + org.opencontainers.image.created="2023-04-11T00:50:15Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="20220731.1.0-debian-11-r69" \ + org.opencontainers.image.ref.name="20220731.1.0-debian-11-r70" \ org.opencontainers.image.title="dokuwiki" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="20220731.1.0" @@ -22,11 +22,11 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates curl ldap-utils libbrotli1 libbsd0 libbz2-1.0 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 libldap-common liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmd0 libmemcached11 libnettle8 libnghttp2-14 libonig5 libp11-kit0 libpam-ldapd 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 nslcd 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" \ - "libphp-8.1.17-1-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.5-2-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.57-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.1.17-5-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.5-4-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ "dokuwiki-20220731.1.0-11-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/dokuwiki/20220731/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/dokuwiki/20220731/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index ef5ee662d8ca..42572aadedba 100644 --- a/bitnami/dokuwiki/20220731/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/dokuwiki/20220731/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,44 +1,38 @@ { "apache": { "arch": "amd64", - "digest": "d5cad8cbc55051131d136e9cdaa6f9802b24641302c8b02d823389c32b4daf30", "distro": "debian-11", "type": "NAMI", - "version": "2.4.56-1" + "version": "2.4.57-0" }, "dokuwiki": { "arch": "amd64", - "digest": "09486fcdace4564528064b17317735021678ac2b90bc790c55728c3aadca4dda", "distro": "debian-11", "type": "NAMI", "version": "20220731.1.0-11" }, "gosu": { "arch": "amd64", - "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-3" + "version": "1.16.0-5" }, "libphp": { "arch": "amd64", - "digest": "24c55f56e7b585fb5e97094f8e6baa8889b0af01ca7cdcc0b268d717e195fb9d", "distro": "debian-11", "type": "NAMI", - "version": "8.1.17-1" + "version": "8.1.17-5" }, "php": { "arch": "amd64", - "digest": "a2e46761af1cce1ac3ca73ab79097278efc9040c60e0564df819b7a7dfc01bc3", "distro": "debian-11", "type": "NAMI", - "version": "8.1.17-3" + "version": "8.1.17-4" }, "render-template": { "arch": "amd64", - "digest": "d1a128e25098f793a92342efd5fa85c1075a2b21042929b269d23c6694e20c3b", "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/dokuwiki/20220731/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/dokuwiki/20220731/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d4b7af6fd3a..d70cf0779ec8 100644 --- a/bitnami/dokuwiki/20220731/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/dokuwiki/20220731/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 @@ -395,7 +400,7 @@ PartOf=bitnami.service Type=${type} EOF if [[ -n "$working_directory" ]]; then - cat >> "$service_file" <<< "WorkingDirectory=$working_directory" + cat >> "$service_file" <<< "WorkingDirectory=${working_directory}" fi if [[ -n "$exec_start_pre" ]]; then # This variable may contain multiple ExecStartPre= directives @@ -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/dokuwiki/20220731/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/dokuwiki/20220731/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..94745ebe419e 100644 --- a/bitnami/dokuwiki/20220731/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/dokuwiki/20220731/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -112,7 +112,11 @@ is_web_server_running() { ######################### web_server_start() { info "Starting $(web_server_type) in background" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then + systemctl start "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + fi } ######################## @@ -126,7 +130,11 @@ web_server_start() { ######################### web_server_stop() { info "Stopping $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then + systemctl stop "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + fi } ######################## @@ -140,7 +148,11 @@ web_server_stop() { ######################### web_server_restart() { info "Restarting $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then + systemctl restart "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + fi } ######################## @@ -153,7 +165,11 @@ web_server_restart() { # None ######################### web_server_reload() { - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then + systemctl reload "bitnami.$(web_server_type).service" + else + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + fi } ########################