From 112deedfc3b7c172a0f030299a0210aabfa26868 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sun, 19 Mar 2023 01:09:02 +0100 Subject: [PATCH] [bitnami/moodle] Release 4.1.2-debian-11-r3 (#27691) Signed-off-by: Bitnami Containers --- bitnami/moodle/4.1/debian-11/Dockerfile | 18 +++--- .../opt/bitnami/.bitnami_components.json | 56 +++++++++---------- .../opt/bitnami/scripts/libservice.sh | 41 ++++++++++++-- .../opt/bitnami/scripts/libmysqlclient.sh | 3 +- 4 files changed, 76 insertions(+), 42 deletions(-) diff --git a/bitnami/moodle/4.1/debian-11/Dockerfile b/bitnami/moodle/4.1/debian-11/Dockerfile index a5cd13c70704..9a521f328bdc 100644 --- a/bitnami/moodle/4.1/debian-11/Dockerfile +++ b/bitnami/moodle/4.1/debian-11/Dockerfile @@ -5,10 +5,10 @@ ARG TARGETARCH ARG WITH_ALL_LOCALES="no" LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-03-17T08:55:30Z" \ + org.opencontainers.image.created="2023-03-18T22:46:08Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.1.2-debian-11-r2" \ + org.opencontainers.image.ref.name="4.1.2-debian-11-r3" \ org.opencontainers.image.title="moodle" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.1.2" @@ -24,14 +24,14 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libcurl4 libedit2 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 locales procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ - "php-8.0.28-2-linux-${OS_ARCH}-debian-11" \ + "php-8.0.28-3-linux-${OS_ARCH}-debian-11" \ "apache-2.4.56-1-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-13.10.0-1-linux-${OS_ARCH}-debian-11" \ - "mysql-client-10.6.12-1-linux-${OS_ARCH}-debian-11" \ - "libphp-8.0.28-3-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.5-1-linux-${OS_ARCH}-debian-11" \ - "moodle-4.1.2-0-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-2-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-13.10.0-2-linux-${OS_ARCH}-debian-11" \ + "mysql-client-10.6.12-2-linux-${OS_ARCH}-debian-11" \ + "libphp-8.0.28-4-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.5-2-linux-${OS_ARCH}-debian-11" \ + "moodle-4.1.2-1-linux-${OS_ARCH}-debian-11" \ + "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ diff --git a/bitnami/moodle/4.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/moodle/4.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 91db01357e42..83abc71014b3 100644 --- a/bitnami/moodle/4.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/moodle/4.1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -8,51 +8,51 @@ }, "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": "722d7b694c1bb91c8fa05b5ba8e837215f14aef38c24975ca10f473265afa20f", + "digest": "27a2516f8d36b23aa874188f9b3708e5cd06a9bf2bb470383b96f6316d23d45a", + "distro": "debian-11", + "type": "NAMI", + "version": "8.0.28-4" + }, + "moodle": { + "arch": "amd64", + "digest": "28880dd3f7d83c879aa7f4630fbcd74f95242ed3a79da59974adbc27305c2166", + "distro": "debian-11", + "type": "NAMI", + "version": "4.1.2-1" + }, + "mysql-client": { + "arch": "amd64", + "digest": "6ed7c73b5e779521cf2f47a00ac54e6d2929213cb4eb3cbd9a4f12f84557c664", + "distro": "debian-11", + "type": "NAMI", + "version": "10.6.12-2" + }, + "php": { + "arch": "amd64", + "digest": "525632515c247e66ce6fcaf8f8aceaa2836c32a2c05616fe071bdb4f1c9b7cf4", "distro": "debian-11", "type": "NAMI", "version": "8.0.28-3" }, - "moodle": { - "arch": "amd64", - "digest": "76a394dc5229a41336d360157324c1d060a17f4433f57965f1e5fb19f1112ebe", - "distro": "debian-11", - "type": "NAMI", - "version": "4.1.2-0" - }, - "mysql-client": { - "arch": "amd64", - "digest": "dbc087bd90a6387956751464da45660229b3e7349b96099805e61dcbc2514853", - "distro": "debian-11", - "type": "NAMI", - "version": "10.6.12-1" - }, - "php": { - "arch": "amd64", - "digest": "9253bfece005a8afc80c15181035bec19fca8556b117ec8a6daa8321e4ec2f1e", - "distro": "debian-11", - "type": "NAMI", - "version": "8.0.28-2" - }, "postgresql-client": { "arch": "amd64", - "digest": "2b34f81adcd687ccfe59415c378605ea9bce9a4200cd2e10599f187fbcecc249", + "digest": "8fe91f9d7614cfa0005f9bb38c0893a7c94e67bfaca421862500c23c68c52ac9", "distro": "debian-11", "type": "NAMI", - "version": "13.10.0-1" + "version": "13.10.0-2" }, "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/moodle/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/moodle/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d53aca9af84..2d4b7af6fd3a 100644 --- a/bitnami/moodle/4.1/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/moodle/4.1/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" <