From 7717ae340417038777dc27d78ad89d44f6da2af5 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Fri, 17 Mar 2023 10:49:59 +0100
Subject: [PATCH] [bitnami/moodle] Release 4.1.2-debian-11-r2 (#27518)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/moodle/4.1/debian-11/Dockerfile                     | 6 +++---
 .../prebuildfs/opt/bitnami/.bitnami_components.json         | 4 ++--
 .../debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh  | 5 +++++
 .../rootfs/opt/bitnami/scripts/moodle/postunpack.sh         | 1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bitnami/moodle/4.1/debian-11/Dockerfile b/bitnami/moodle/4.1/debian-11/Dockerfile
index d3d5bf1dfb71..a5cd13c70704 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-14T14:45:57Z" \
+      org.opencontainers.image.created="2023-03-17T08:55:30Z" \
       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-r1" \
+      org.opencontainers.image.ref.name="4.1.2-debian-11-r2" \
       org.opencontainers.image.title="moodle" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.1.2"
@@ -25,7 +25,7 @@ RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "php-8.0.28-2-linux-${OS_ARCH}-debian-11" \
-      "apache-2.4.56-0-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" \
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 981f5a7deffd..91db01357e42 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
@@ -1,10 +1,10 @@
 {
     "apache": {
         "arch": "amd64",
-        "digest": "d03822c8f55162804b116a8d1753545a39faed5de86139ea775aefbd63252510",
+        "digest": "d5cad8cbc55051131d136e9cdaa6f9802b24641302c8b02d823389c32b4daf30",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "2.4.56-0"
+        "version": "2.4.56-1"
     },
     "gosu": {
         "arch": "amd64",
diff --git a/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh
index 56ce1b553f7b..c6b4edbcf1eb 100644
--- a/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh
+++ b/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh
@@ -446,6 +446,11 @@ mysql_stop() {
 mysql_install_db() {
     local command="${DB_BIN_DIR}/mysql_install_db"
     local -a args=("--defaults-file=${DB_CONF_FILE}" "--basedir=${DB_BASE_DIR}" "--datadir=${DB_DATA_DIR}")
+    
+    # Add flags specified via the 'DB_EXTRA_FLAGS' environment variable
+    read -r -a db_extra_flags <<< "$(mysql_extra_flags)"
+    [[ "${#db_extra_flags[@]}" -gt 0 ]] && args+=("${db_extra_flags[@]}")
+
     am_i_root && args=("${args[@]}" "--user=$DB_DAEMON_USER")
     if [[ "$DB_FLAVOR" = "mariadb" ]]; then
         args+=("--auth-root-authentication-method=normal")
diff --git a/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/moodle/postunpack.sh b/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/moodle/postunpack.sh
index 5f85baa46ed5..8cf495d2e82a 100755
--- a/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/moodle/postunpack.sh
+++ b/bitnami/moodle/4.1/debian-11/rootfs/opt/bitnami/scripts/moodle/postunpack.sh
@@ -63,4 +63,5 @@ RewriteRule "(\/tests\/behat\/)" - [F]
 RewriteRule "(\/fixtures\/)" - [F]
 
 RewriteRule "(\/package\.json)" - [F]
+RewriteRule "(\/Gruntfile\.js)" - [F]
 '