diff --git a/bitnami/moodle/4/debian-11/Dockerfile b/bitnami/moodle/4/debian-11/Dockerfile index b91e593f002e..8719793e6628 100644 --- a/bitnami/moodle/4/debian-11/Dockerfile +++ b/bitnami/moodle/4/debian-11/Dockerfile @@ -6,7 +6,7 @@ ARG WITH_ALL_LOCALES="no" LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="4.0.4-debian-11-r8" \ + org.opencontainers.image.ref.name="4.0.4-debian-11-r9" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/moodle" \ org.opencontainers.image.title="moodle" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -22,13 +22,13 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages acl ca-certificates cron curl libaudit1 libbrotli1 libbsd0 libbz2-1.0 libc6 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 libmcrypt4 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/ && \ - if [ ! -f php-7.4.30-164-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/php-7.4.30-164-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/php-7.4.30-164-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ + if [ ! -f php-7.4.30-165-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/php-7.4.30-165-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/php-7.4.30-165-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ fi && \ - sha256sum -c php-7.4.30-164-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf php-7.4.30-164-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf php-7.4.30-164-linux-${OS_ARCH}-debian-11.tar.gz php-7.4.30-164-linux-${OS_ARCH}-debian-11.tar.gz.sha256 + sha256sum -c php-7.4.30-165-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf php-7.4.30-165-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf php-7.4.30-165-linux-${OS_ARCH}-debian-11.tar.gz php-7.4.30-165-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ if [ ! -f apache-2.4.54-156-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ curl -SsLf https://downloads.bitnami.com/files/stacksmith/apache-2.4.54-156-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ @@ -70,13 +70,13 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ tar -zxf render-template-1.0.3-153-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ rm -rf render-template-1.0.3-153-linux-${OS_ARCH}-debian-11.tar.gz render-template-1.0.3-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f moodle-4.0.4-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/moodle-4.0.4-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/moodle-4.0.4-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ + if [ ! -f moodle-4.0.4-1-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/moodle-4.0.4-1-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/moodle-4.0.4-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ fi && \ - sha256sum -c moodle-4.0.4-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf moodle-4.0.4-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf moodle-4.0.4-0-linux-${OS_ARCH}-debian-11.tar.gz moodle-4.0.4-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 + sha256sum -c moodle-4.0.4-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf moodle-4.0.4-1-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf moodle-4.0.4-1-linux-${OS_ARCH}-debian-11.tar.gz moodle-4.0.4-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ if [ ! -f gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ curl -SsLf https://downloads.bitnami.com/files/stacksmith/gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ diff --git a/bitnami/moodle/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/moodle/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index f3e3d4be030a..bdf4fdb371c9 100644 --- a/bitnami/moodle/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/moodle/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -22,10 +22,10 @@ }, "moodle": { "arch": "amd64", - "digest": "aa799eca653beb8bc8f5f96c80d8e56e9913785a1bfa4a5f830ccfd6ad81eda0", + "digest": "65c113dd56935488a3a20c274080fecd4bdf5fd3e962c854450ada7b69c4f1be", "distro": "debian-11", "type": "NAMI", - "version": "4.0.4-0" + "version": "4.0.4-1" }, "mysql-client": { "arch": "amd64", @@ -36,10 +36,10 @@ }, "php": { "arch": "amd64", - "digest": "357ee81bdee9215f6d60ad83c1b4a7987a37cac1d23b45301f761ad4469e1c13", + "digest": "754e7b04ae9e332b70f949686f46cd7e861163d979de1b3ee69d904791561b5c", "distro": "debian-11", "type": "NAMI", - "version": "7.4.30-164" + "version": "7.4.30-165" }, "postgresql-client": { "arch": "amd64", diff --git a/bitnami/moodle/4/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh b/bitnami/moodle/4/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh index 0b888e342829..39080c53031e 100644 --- a/bitnami/moodle/4/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh +++ b/bitnami/moodle/4/debian-11/rootfs/opt/bitnami/scripts/libmoodle.sh @@ -388,14 +388,20 @@ moodle_configure_wwwroot() { # sed replacement notes: # - The ampersand ('&') is escaped due to sed replacing any non-escaped ampersand characters with the matched string # - For the replacement text to be multi-line, an \ needs to be specified to escape the newline character - local -r conf_to_replace="if (empty(\$_SERVER['HTTP_HOST'])) {\\ + local conf_to_replace="if (empty(\$_SERVER['HTTP_HOST'])) {\\ \$_SERVER['HTTP_HOST'] = '127.0.0.1:${http_port}';\\ -}\\ +}" + if is_boolean_yes "$MOODLE_SSLPROXY"; then + conf_to_replace="$conf_to_replace\\ +\$CFG->wwwroot = 'https://' . ${host};" + else + conf_to_replace="$conf_to_replace\\ if (isset(\$_SERVER['HTTPS']) \&\& \$_SERVER['HTTPS'] == 'on') {\\ \$CFG->wwwroot = 'https://' . ${host};\\ } else {\\ \$CFG->wwwroot = 'http://' . ${host};\\ }" + fi replace_in_file "$MOODLE_CONF_FILE" "\\\$CFG->wwwroot\s*=.*" "$conf_to_replace" } diff --git a/bitnami/moodle/README.md b/bitnami/moodle/README.md index d01c54a94f84..0ed3471275a7 100644 --- a/bitnami/moodle/README.md +++ b/bitnami/moodle/README.md @@ -37,7 +37,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) for deploy 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/). -* [`4`, `4-debian-11`, `4.0.4`, `4.0.4-debian-11-r8`, `latest` (4/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/moodle/4/debian-11/Dockerfile) +* [`4`, `4-debian-11`, `4.0.4`, `4.0.4-debian-11-r9`, `latest` (4/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/moodle/4/debian-11/Dockerfile) * [`3`, `3-debian-11`, `3.11.10`, `3.11.10-debian-11-r9` (3/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/moodle/3/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).