From 47dca5e12377ca6691fdc9ca3d91fd3b70070bab Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 18 Mar 2023 23:04:45 +0100 Subject: [PATCH] [bitnami/dokuwiki] Release 20220731.1.0-debian-11-r68 (#27576) Signed-off-by: Bitnami Containers --- .../dokuwiki/20220731/debian-11/Dockerfile | 16 ++++---- .../opt/bitnami/.bitnami_components.json | 24 +++++------ .../opt/bitnami/scripts/libservice.sh | 41 +++++++++++++++++-- bitnami/dokuwiki/README.md | 1 - 4 files changed, 57 insertions(+), 25 deletions(-) diff --git a/bitnami/dokuwiki/20220731/debian-11/Dockerfile b/bitnami/dokuwiki/20220731/debian-11/Dockerfile index bcc7b6db980a..f473f7299b1b 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-13T22:15:52Z" \ + org.opencontainers.image.created="2023-03-18T21:18:19Z" \ 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-r67" \ + org.opencontainers.image.ref.name="20220731.1.0-debian-11-r68" \ org.opencontainers.image.title="dokuwiki" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="20220731.1.0" @@ -22,12 +22,12 @@ 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.16-2-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.56-0-linux-${OS_ARCH}-debian-11" \ - "libphp-8.1.16-3-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ - "dokuwiki-20220731.1.0-10-linux-${OS_ARCH}-debian-11" \ + "php-8.1.17-1-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" \ + "dokuwiki-20220731.1.0-11-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ 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 b9d6b2ff7f0f..8fc8fbd485b2 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,44 @@ { "apache": { "arch": "amd64", - "digest": "d03822c8f55162804b116a8d1753545a39faed5de86139ea775aefbd63252510", + "digest": "d5cad8cbc55051131d136e9cdaa6f9802b24641302c8b02d823389c32b4daf30", "distro": "debian-11", "type": "NAMI", - "version": "2.4.56-0" + "version": "2.4.56-1" }, "dokuwiki": { "arch": "amd64", - "digest": "108f74057f3e373854626896dabb60c3d5d53fef4f4b9e5fdf12afcd1947463e", + "digest": "09486fcdace4564528064b17317735021678ac2b90bc790c55728c3aadca4dda", "distro": "debian-11", "type": "NAMI", - "version": "20220731.1.0-10" + "version": "20220731.1.0-11" }, "gosu": { "arch": "amd64", - "digest": "f6056076afb745fd7d9d87d20f71e7248d63330352cf5ae0be2130b7f44a8cfa", + "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23", "distro": "debian-11", "type": "NAMI", - "version": "1.16.0-2" + "version": "1.16.0-3" }, "libphp": { "arch": "amd64", - "digest": "6556a2340a5156847b4526d9da53c875d2a95760d0681bdcff814a2686f71842", + "digest": "24c55f56e7b585fb5e97094f8e6baa8889b0af01ca7cdcc0b268d717e195fb9d", "distro": "debian-11", "type": "NAMI", - "version": "8.1.16-3" + "version": "8.1.17-1" }, "php": { "arch": "amd64", - "digest": "a10f96a58910715edded557f5e8f59be11b73132257b024cab6ddc864eac186e", + "digest": "29a2bd14bc69f30f96706c9d26c42e4613c50a663ddcd1c10b20766ca261127b", "distro": "debian-11", "type": "NAMI", - "version": "8.1.16-2" + "version": "8.1.17-1" }, "render-template": { "arch": "amd64", - "digest": "185e277977366ec222d2bde1a395ffa138ce1a9d3bdf1df20c3e49e8b8f9c68b", + "digest": "d1a128e25098f793a92342efd5fa85c1075a2b21042929b269d23c6694e20c3b", "distro": "debian-11", "type": "NAMI", - "version": "1.0.5-1" + "version": "1.0.5-2" } } \ 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 2d53aca9af84..2d4b7af6fd3a 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 @@ -281,6 +281,8 @@ remove_logrotate_conf() { # --environment - Environment variable to define (multiple --environment options may be passed) # --environment-file - Text file with environment variables # --exec-start - Start command (required) +# --exec-start-pre - Pre-start command (optional) +# --exec-start-post - Post-start command (optional) # --exec-stop - Stop command (optional) # --exec-reload - Reload command (optional) # --group - System group to start the service with @@ -292,6 +294,7 @@ remove_logrotate_conf() { # --success-exit-status - Exit code that indicates a successful shutdown # --type - Systemd unit type (defaults to forking) # --user - System user to start the service with +# --working-directory - Working directory at which to start the service # Returns: # None ######################### @@ -307,6 +310,8 @@ generate_systemd_conf() { local environment="" local environment_file="" local exec_start="" + local exec_start_pre="" + local exec_start_post="" local exec_stop="" local exec_reload="" local restart="always" @@ -316,6 +321,7 @@ generate_systemd_conf() { local limits_content="" local success_exit_status="" local custom_service_content="" + local working_directory="" # Parse CLI flags shift while [[ "$#" -gt 0 ]]; do @@ -334,6 +340,7 @@ generate_systemd_conf() { | --standard-error \ | --success-exit-status \ | --custom-service-content \ + | --working-directory \ ) var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" shift @@ -345,11 +352,21 @@ generate_systemd_conf() { shift limits_content+="Limit${var_name^^}=${1:?"--limit-${var_name} value is missing"}" ;; + --exec-start-pre) + shift + [[ -n "$exec_start_pre" ]] && exec_start_pre+=$'\n' + exec_start_pre+="ExecStartPre=${1:?"--exec-start-pre value is missing"}" + ;; + --exec-start-post) + shift + [[ -n "$exec_start_post" ]] && exec_start_post+=$'\n' + exec_start_post+="ExecStartPost=${1:?"--exec-start-post value is missing"}" + ;; --environment) shift # It is possible to add multiple environment lines [[ -n "$environment" ]] && environment+=$'\n' - environment+="Environment=${1:?"environment" is missing}" + environment+="Environment=${1:?"--environment value is missing"}" ;; *) echo "Invalid command line flag ${1}" >&2 @@ -376,8 +393,21 @@ PartOf=bitnami.service [Service] Type=${type} -ExecStart=${exec_start} EOF + if [[ -n "$working_directory" ]]; then + cat >> "$service_file" <<< "WorkingDirectory=$working_directory" + fi + if [[ -n "$exec_start_pre" ]]; then + # This variable may contain multiple ExecStartPre= directives + cat >> "$service_file" <<< "$exec_start_pre" + fi + if [[ -n "$exec_start" ]]; then + cat >> "$service_file" <<< "ExecStart=${exec_start}" + fi + if [[ -n "$exec_start_post" ]]; then + # This variable may contain multiple ExecStartPost= directives + cat >> "$service_file" <<< "$exec_start_post" + fi # Optional stop and reload commands if [[ -n "$exec_stop" ]]; then cat >> "$service_file" <<< "ExecStop=${exec_stop}" @@ -399,8 +429,9 @@ EOF if [[ -n "$restart" ]]; then cat >> "$service_file" <<< "Restart=${restart}" fi - # Environment flags (may be specified multiple times in a unit) + # Environment flags if [[ -n "$environment" ]]; then + # This variable may contain multiple Environment= directives cat >> "$service_file" <<< "$environment" fi if [[ -n "$environment_file" ]]; then @@ -414,6 +445,7 @@ EOF cat >> "$service_file" <<< "StandardError=${standard_error}" fi if [[ -n "$custom_service_content" ]]; then + # This variable may contain multiple miscellaneous directives cat >> "$service_file" <<< "$custom_service_content" fi if [[ -n "$success_exit_status" ]]; then @@ -424,7 +456,8 @@ EOF fi cat >> "$service_file" < DokuWiki is a standards-compliant wiki optimized for creating documentation. Designed to be simple to use for small organizations, it stores all data in plain text files so no database is required. [Overview of DokuWiki](https://www.splitbrain.org/projects/dokuwiki) - Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. ## TL;DR