From a2efdbfdd2335f79c879529e4a6f1275b4f0ad70 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 7 Dec 2023 14:33:17 +0100 Subject: [PATCH] [bitnami/moodle] Release 4.2.3-debian-11-r4 (#53578) Signed-off-by: Bitnami Containers --- bitnami/moodle/4.2/debian-11/Dockerfile | 28 +++++++++---------- .../opt/bitnami/.bitnami_components.json | 12 ++++---- .../opt/bitnami/scripts/libbitnami.sh | 10 +++---- .../debian-11/prebuildfs/usr/sbin/run-script | 2 +- .../opt/bitnami/scripts/apache/postunpack.sh | 1 + .../rootfs/opt/bitnami/scripts/libmoodle.sh | 21 ++++---------- 6 files changed, 33 insertions(+), 41 deletions(-) diff --git a/bitnami/moodle/4.2/debian-11/Dockerfile b/bitnami/moodle/4.2/debian-11/Dockerfile index c92907d9587f..9bf3d37aafaa 100644 --- a/bitnami/moodle/4.2/debian-11/Dockerfile +++ b/bitnami/moodle/4.2/debian-11/Dockerfile @@ -9,10 +9,10 @@ ARG WITH_ALL_LOCALES="no" LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-11-03T09:39:06Z" \ + org.opencontainers.image.created="2023-12-02T08:30:53Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.2.3-debian-11-r1" \ + org.opencontainers.image.ref.name="4.2.3-debian-11-r4" \ org.opencontainers.image.title="moodle" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.2.3" @@ -22,26 +22,26 @@ ENV OS_ARCH="${TARGETARCH:-amd64}" \ OS_NAME="linux" COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] +SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies 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 openssl procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ +RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "php-8.1.25-0-linux-${OS_ARCH}-debian-11" \ - "apache-2.4.58-0-linux-${OS_ARCH}-debian-11" \ - "postgresql-client-13.12.0-1-linux-${OS_ARCH}-debian-11" \ - "mysql-client-11.1.2-2-linux-${OS_ARCH}-debian-11" \ - "libphp-8.1.25-0-linux-${OS_ARCH}-debian-11" \ - "render-template-1.0.6-2-linux-${OS_ARCH}-debian-11" \ + "php-8.1.26-4-linux-${OS_ARCH}-debian-11" \ + "apache-2.4.58-1-linux-${OS_ARCH}-debian-11" \ + "postgresql-client-13.13.0-0-linux-${OS_ARCH}-debian-11" \ + "mysql-client-11.1.3-0-linux-${OS_ARCH}-debian-11" \ + "libphp-8.1.26-0-linux-${OS_ARCH}-debian-11" \ + "render-template-1.0.6-3-linux-${OS_ARCH}-debian-11" \ "moodle-4.2.3-1-linux-${OS_ARCH}-debian-11" \ - ) && \ + ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \ - fi && \ - sha256sum -c "${COMPONENT}.tar.gz.sha256" && \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + fi ; \ + sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \ + tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \ rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \ done RUN apt-get autoremove --purge -y curl && \ diff --git a/bitnami/moodle/4.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/moodle/4.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index c09874af81f8..98cb5f1c032d 100644 --- a/bitnami/moodle/4.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/moodle/4.2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,13 +3,13 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "2.4.58-0" + "version": "2.4.58-1" }, "libphp": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.25-0" + "version": "8.1.26-0" }, "moodle": { "arch": "amd64", @@ -21,24 +21,24 @@ "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "11.1.2-2" + "version": "11.1.3-0" }, "php": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "8.1.25-0" + "version": "8.1.26-4" }, "postgresql-client": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "13.12.0-1" + "version": "13.13.0-0" }, "render-template": { "arch": "amd64", "distro": "debian-11", "type": "NAMI", - "version": "1.0.6-2" + "version": "1.0.6-3" } } \ No newline at end of file diff --git a/bitnami/moodle/4.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/moodle/4.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh index 184de8a117e2..3853c789b2ea 100644 --- a/bitnami/moodle/4.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/moodle/4.2/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -44,10 +44,10 @@ print_welcome_page() { print_image_welcome_page() { local github_url="https://github.com/bitnami/containers" - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" + info "" + info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + info "" } diff --git a/bitnami/moodle/4.2/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/moodle/4.2/debian-11/prebuildfs/usr/sbin/run-script index 4ca0f897277e..b7a5bf1e50bf 100755 --- a/bitnami/moodle/4.2/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/moodle/4.2/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-n}" +fail_if_not_present="${3:-y}" if test -f "$script"; then sh $script diff --git a/bitnami/moodle/4.2/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/moodle/4.2/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh index 765d1d8ce1ed..6a480ad4ddde 100755 --- a/bitnami/moodle/4.2/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh +++ b/bitnami/moodle/4.2/debian-11/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -46,6 +46,7 @@ apache_setup_bitnami_config() { local -a modules_to_disable=( "http2_module" "proxy_hcheck_module" + "proxy_html_module" "proxy_http2_module" ) for module in "${modules_to_disable[@]}"; do diff --git a/bitnami/moodle/4.2/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh b/bitnami/moodle/4.2/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh index bec8c505c94b..b7e043bf4d1c 100644 --- a/bitnami/moodle/4.2/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh +++ b/bitnami/moodle/4.2/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh @@ -156,15 +156,6 @@ moodle_initialize() { read -r -a extra_args <<<"$MOODLE_INSTALL_EXTRA_ARGS" [[ "${#extra_args[@]}" -gt 0 ]] && moodle_install_args+=("${extra_args[@]}") - # Handle --prefix (table prefix) being overridden via MOODLE_INSTALL_EXTRA_ARGS - mdl_prefix="mdl_" - for extra_arg in "${extra_args[@]}"; do - if [[ $extra_arg == --prefix=* ]]; then - mdl_prefix=${extra_arg#--prefix=} - break - fi - done - # Setup Moodle if ! is_boolean_yes "$MOODLE_SKIP_BOOTSTRAP"; then info "Running Moodle install script" @@ -175,17 +166,17 @@ moodle_initialize() { [[ "$db_type" = "pgsql" ]] && db_remote_execute="postgresql_remote_execute" local -a db_execute_args=("$db_host" "$db_port" "$db_name" "$db_user" "$db_pass") # Configure no-reply e-mail address for SMTP - echo "INSERT INTO ${mdl_prefix}config (name, value) VALUES ('noreplyaddress', '${MOODLE_EMAIL}')" | "$db_remote_execute" "${db_execute_args[@]}" + echo "INSERT INTO mdl_config (name, value) VALUES ('noreplyaddress', '${MOODLE_EMAIL}')" | "$db_remote_execute" "${db_execute_args[@]}" # Additional Bitnami customizations - echo "UPDATE ${mdl_prefix}course SET summary='Moodle powered by Bitnami' WHERE id='1'" | "$db_remote_execute" "${db_execute_args[@]}" + echo "UPDATE mdl_course SET summary='Moodle powered by Bitnami' WHERE id='1'" | "$db_remote_execute" "${db_execute_args[@]}" # SMTP configuration if ! is_empty_value "$MOODLE_SMTP_HOST"; then info "Configuring SMTP credentials" "$db_remote_execute" "${db_execute_args[@]}" <