[bitnami/moodle] Release 4.1.7-debian-11-r0 (#53853)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
bitnami · Dec 15, 2023 · 8f2e093 · 8f2e093
1 parent c7d6fd4
commit 8f2e093
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 19 deletions.
diff --git a/bitnami/moodle/4.1/debian-11/Dockerfile b/bitnami/moodle/4.1/debian-11/Dockerfile
@@ -9,13 +9,13 @@ 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-12-02T07:51:09Z" \
+      org.opencontainers.image.created="2023-12-15T09:56:41Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.1.6-debian-11-r6" \
+      org.opencontainers.image.ref.name="4.1.7-debian-11-r0" \
       org.opencontainers.image.title="moodle" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="4.1.6"
+      org.opencontainers.image.version="4.1.7"
 
 ENV OS_ARCH="${TARGETARCH:-amd64}" \
     OS_FLAVOUR="debian-11" \
@@ -27,13 +27,13 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-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 openssl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "php-8.1.26-4-linux-${OS_ARCH}-debian-11" \
-      "apache-2.4.58-1-linux-${OS_ARCH}-debian-11" \
+      "php-8.1.26-11-linux-${OS_ARCH}-debian-11" \
+      "apache-2.4.58-2-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.1.6-1-linux-${OS_ARCH}-debian-11" \
+      "render-template-1.0.6-4-linux-${OS_ARCH}-debian-11" \
+      "moodle-4.1.7-0-linux-${OS_ARCH}-debian-11" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -63,7 +63,7 @@ RUN /opt/bitnami/scripts/moodle/postunpack.sh
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
 ENV APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
-    APP_VERSION="4.1.6" \
+    APP_VERSION="4.1.7" \
     BITNAMI_APP_NAME="moodle" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \

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
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.4.58-1"
+        "version": "2.4.58-2"
     },
     "libphp": {
         "arch": "amd64",
@@ -15,7 +15,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "4.1.6-1"
+        "version": "4.1.7-0"
     },
     "mysql-client": {
         "arch": "amd64",
@@ -27,7 +27,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "8.1.26-4"
+        "version": "8.1.26-11"
     },
     "postgresql-client": {
         "arch": "amd64",
@@ -39,6 +39,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.0.6-3"
+        "version": "1.0.6-4"
     }
 }
diff --git a/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh b/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh
@@ -156,6 +156,14 @@ 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"
@@ -166,17 +174,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_config (name, value) VALUES ('noreplyaddress', '${MOODLE_EMAIL}')" | "$db_remote_execute" "${db_execute_args[@]}"
+	    echo "INSERT INTO ${mdl_prefix}config (name, value) VALUES ('noreplyaddress', '${MOODLE_EMAIL}')" | "$db_remote_execute" "${db_execute_args[@]}"
             # Additional Bitnami customizations
-            echo "UPDATE mdl_course SET summary='Moodle powered by Bitnami' WHERE id='1'" | "$db_remote_execute" "${db_execute_args[@]}"
+            echo "UPDATE ${mdl_prefix}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[@]}" <<EOF
-UPDATE mdl_config SET value='${MOODLE_SMTP_HOST}:${MOODLE_SMTP_PORT_NUMBER}' WHERE name='smtphosts';
-UPDATE mdl_config SET value='${MOODLE_SMTP_USER}' WHERE name='smtpuser';
-UPDATE mdl_config SET value='${MOODLE_SMTP_PASSWORD}' WHERE name='smtppass';
-UPDATE mdl_config SET value='${MOODLE_SMTP_PROTOCOL}' WHERE name='smtpsecure';
+UPDATE ${mdl_prefix}config SET value='${MOODLE_SMTP_HOST}:${MOODLE_SMTP_PORT_NUMBER}' WHERE name='smtphosts';
+UPDATE ${mdl_prefix}config SET value='${MOODLE_SMTP_USER}' WHERE name='smtpuser';
+UPDATE ${mdl_prefix}config SET value='${MOODLE_SMTP_PASSWORD}' WHERE name='smtppass';
+UPDATE ${mdl_prefix}config SET value='${MOODLE_SMTP_PROTOCOL}' WHERE name='smtpsecure';
 EOF
             fi
         else

diff --git a/bitnami/moodle/4.1/debian-11/tags-info.yaml b/bitnami/moodle/4.1/debian-11/tags-info.yaml
@@ -1,4 +1,4 @@
 rolling-tags:
 - "4.1"
 - 4.1-debian-11
-- 4.1.6
+- 4.1.7