3.9.1-debian-10-r1 release

bitnami/moodle/3/debian-10/Dockerfile

@@ -9,15 +9,16 @@ ENV HOME="/" \
 COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates cron curl gzip libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjemalloc2 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 libmcrypt4 libmemcached11 libmemcachedutil2 libncurses6 libnettle6 libnghttp2-14 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 locales procps tar zlib1g
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.3.19-3" --checksum afa209bbdf622ab11b677cd01082acd7f9a190b30e68d5434aced4e69e033dde
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.3.20-0" --checksum 23abc614023c7937b0d2a65347e5f9d5cf0003783676fd7173ded7e9e6cc13f3
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.43-5" --checksum e9faded57e3703fe9fcea650eb302e673d969a399fe9dfafa67e173465637665
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.23-1" --checksum efab843077267af6a8cde53440a1fef0acf8cb67ab1dcd0b6da2e9cbe050c7e1
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.3.19-2" --checksum c5dddf3ea541f5c0d6f65fa7d743de710de5ec53cdf8458a25c74e70f0c8397d
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.3.20-0" --checksum 15fa4a11f2e11377ba0d6476ce22021349f62ef2fdfbe2af4f86dca10baaa997
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-1" --checksum a94f94357aa06f3718db1550fa5f5188cd61383d66bf754eef49c58a18bf02cc
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "moodle" "3.9.1-0" --checksum 01c38d2e17ee8daccb57e68fa371479b8aba56b7912d6f6a6bfc537ddd2bda10
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-1" --checksum 51cfb1b7fd7b05b8abd1df0278c698103a9b1a4964bdacd87ca1d5c01631d59c
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
+RUN chmod g+rwX /opt/bitnami
 RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8
 RUN sed -i -e '/pam_loginuid.so/ s/^#*/#/' /etc/pam.d/cron
 RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \
@@ -30,12 +31,13 @@ RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/apache/postunpack.sh
 RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh
 RUN /opt/bitnami/scripts/moodle/postunpack.sh
+RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_ENABLE_CUSTOM_PORTS="no" \
     APACHE_HTTPS_PORT_NUMBER="" \
     APACHE_HTTP_PORT_NUMBER="" \
     BITNAMI_APP_NAME="moodle" \
-    BITNAMI_IMAGE_VERSION="3.9.1-debian-10-r0" \
+    BITNAMI_IMAGE_VERSION="3.9.1-debian-10-r1" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     MARIADB_HOST="mariadb" \

bitnami/moodle/3/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh

@@ -277,3 +277,15 @@ generate_random_string() {
     result="$(head -n "$((count + 10))" /dev/urandom | tr -dc "$filter" | head -c "$count")"
     echo "$result"
 }
+
+########################
+# Create md5 hash from a string
+# Arguments:
+#   $1 - string
+# Returns:
+#   md5 hash - string
+#########################
+generate_md5_hash() {
+  local -r str="${1:?missing input string}"
+  echo -n "$str" | md5sum | awk '{print $1}'
+}

bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh

@@ -38,7 +38,15 @@ mysql_client_validate() {
         print_validation_error "The password cannot contain backslashes ('\'). Set the environment variable $1 with no backslashes (more info at https://dev.mysql.com/doc/refman/8.0/en/string-comparison-functions.html)"
     }
 
+    check_yes_no_value() {
+        if ! is_yes_no_value "${!1}" && ! is_true_false_value "${!1}"; then
+            print_validation_error "The allowed values for ${1} are: yes no"
+        fi
+    }
+
     # Only validate environment variables if any action needs to be performed
+    check_yes_no_value "DB_TLS_ENABLED"
+
     if [[ -n "$DB_CREATE_DATABASE_USER" || -n "$DB_CREATE_DATABASE_NAME" ]]; then
         if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then
             empty_password_enabled_warn
@@ -70,6 +78,10 @@ mysql_client_validate() {
 #   None
 #########################
 mysql_client_initialize() {
+    # Wrap binary to force the usage of TLS
+    if is_boolean_yes "$DB_TLS_ENABLED"; then
+        mysql_client_wrap_binary_for_tls
+    fi
     # Wait for the database to be accessible if any action needs to be performed
     if [[ -n "$DB_CREATE_DATABASE_USER" || -n "$DB_CREATE_DATABASE_NAME" ]]; then
         info "Trying to connect to the database server"
@@ -100,6 +112,27 @@ mysql_client_initialize() {
     fi
 }
 
+########################
+# Wrap binary to force the usage of TLS
+# Globals:
+#   DB_*
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+mysql_client_wrap_binary_for_tls() {
+    local -r wrapper_file="${DB_BIN_DIR}/mysql"
+    local -r wrapped_binary_file="${DB_BASE_DIR}/.bin/mysql"
+
+    mv "$wrapper_file" "$wrapped_binary_file"
+    cat >"$wrapper_file" <<EOF
+#!/bin/sh
+exec "${wrapped_binary_file}" "\$@" --ssl=1
+EOF
+    chmod +x "$wrapper_file"
+}
+
 ########################
 # Extract mysql version from version string
 # Globals:

bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh

@@ -29,6 +29,7 @@ mysql_env_vars=(
     MYSQL_CLIENT_CREATE_DATABASE_PASSWORD
     MYSQL_CLIENT_CREATE_DATABASE_CHARACTER_SET
     MYSQL_CLIENT_CREATE_DATABASE_COLLATE
+    MYSQL_CLIENT_TLS_ENABLED
 
 )
 for env_var in "${mysql_env_vars[@]}"; do
@@ -79,5 +80,7 @@ export MYSQL_CLIENT_CREATE_DATABASE_CHARACTER_SET="${MYSQL_CLIENT_CREATE_DATABAS
 export DB_CREATE_DATABASE_CHARACTER_SET="$MYSQL_CLIENT_CREATE_DATABASE_CHARACTER_SET"
 export MYSQL_CLIENT_CREATE_DATABASE_COLLATE="${MYSQL_CLIENT_CREATE_DATABASE_COLLATE:-}"
 export DB_CREATE_DATABASE_COLLATE="$MYSQL_CLIENT_CREATE_DATABASE_COLLATE"
+export MYSQL_CLIENT_TLS_ENABLED="${MYSQL_CLIENT_TLS_ENABLED:-no}"
+export DB_TLS_ENABLED="$MYSQL_CLIENT_TLS_ENABLED"
 
 # Custom environment variables may be defined below

bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/mysql-client/postunpack.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# shellcheck disable=SC1091
+
+set -o errexit
+set -o nounset
+set -o pipefail
+# set -o xtrace # Uncomment this line for debugging purposes
+
+# Load libraries
+. /opt/bitnami/scripts/libfs.sh
+
+# Load MySQL Client environment variables
+. /opt/bitnami/scripts/mysql-client-env.sh
+
+for dir in "$DB_BIN_DIR" "${DB_BASE_DIR}/.bin"; do
+    ensure_dir_exists "$dir"
+    chmod g+rwX "$dir"
+done

bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/php/postunpack.sh

@@ -22,6 +22,9 @@ php_conf_set "opcache.file_cache" "$PHP_DEFAULT_OPCACHE_FILE_CACHE"
 # PHP-FPM configuration
 php_conf_set "listen" "$PHP_FPM_DEFAULT_LISTEN_ADDRESS" "${PHP_CONF_DIR}/php-fpm.d/www.conf"
 
+# TMP dir configuration
+php_conf_set upload_tmp_dir "$PHP_TMP_DIR"
+
 # Ensure directories used by PHP-FPM exist and have proper ownership and permissions
 for dir in "$PHP_CONF_DIR" "$PHP_TMP_DIR" "$PHP_FPM_LOGS_DIR"; do
     ensure_dir_exists "$dir"
@@ -29,6 +32,7 @@ for dir in "$PHP_CONF_DIR" "$PHP_TMP_DIR" "$PHP_FPM_LOGS_DIR"; do
 done
 
 info "Disabling PHP-FPM daemon user/group configuration"
-echo "" > "${PHP_CONF_DIR}/common.conf"
+mv "${PHP_CONF_DIR}/common.conf" "${PHP_CONF_DIR}/common.conf.disabled"
+touch "${PHP_CONF_DIR}/common.conf"
 
 ln -sf "/dev/stdout" "${PHP_FPM_LOG_FILE}"

bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/php/setup.sh

@@ -20,6 +20,10 @@ if am_i_root; then
     ensure_user_exists "$PHP_FPM_DAEMON_USER" "$PHP_FPM_DAEMON_GROUP"
     ensure_dir_exists "$PHP_TMP_DIR"
     chown -R "${PHP_FPM_DAEMON_USER}:${PHP_FPM_DAEMON_GROUP}" "$PHP_TMP_DIR"
+    # Enable daemon configuration
+    if [[ ! -f "${PHP_CONF_DIR}/common.conf" ]]; then
+        cp "${PHP_CONF_DIR}/common.conf.disabled" "${PHP_CONF_DIR}/common.conf"
+    fi
 fi
 
 php_initialize

bitnami/moodle/README.md

@@ -39,7 +39,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`3-debian-10`, `3.9.1-debian-10-r0`, `3`, `3.9.1`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-moodle/blob/3.9.1-debian-10-r0/3/debian-10/Dockerfile)
+* [`3-debian-10`, `3.9.1-debian-10-r1`, `3`, `3.9.1`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-moodle/blob/3.9.1-debian-10-r1/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/moodle GitHub repo](https://github.com/bitnami/bitnami-docker-moodle).