diff --git a/bitnami/moodle/4/debian-11/Dockerfile b/bitnami/moodle/4/debian-11/Dockerfile index 6d1059f3bfef..b91e593f002e 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-r7" \ + org.opencontainers.image.ref.name="4.0.4-debian-11-r8" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/moodle" \ org.opencontainers.image.title="moodle" \ org.opencontainers.image.vendor="VMware, Inc." \ 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 39080c53031e..0b888e342829 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,20 +388,14 @@ 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 conf_to_replace="if (empty(\$_SERVER['HTTP_HOST'])) {\\ + local -r 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 a60bdaed1b27..24d0eb612e12 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-r7`, `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-r8`, `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-r8` (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).