diff --git a/bitnami/moodle/3/debian-10/Dockerfile b/bitnami/moodle/3/debian-10/Dockerfile index 9d974fc37eeb..1d54b3e2bc7f 100644 --- a/bitnami/moodle/3/debian-10/Dockerfile +++ b/bitnami/moodle/3/debian-10/Dockerfile @@ -14,7 +14,7 @@ COPY prebuildfs / 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 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 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 tar zlib1g RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.4.25-4" --checksum ad0e16b36d93d6410f1266bf45f1f853038c9c8bb04523dd3e408b426ceb6a18 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.51-0" --checksum 71010c86332e4ad0993bc875d103bb916184f1f42884a9098db65c969553c34a -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.31-2" --checksum 15b394a022ca1d0b4b89bfee0487ee13f9e8cc697d0ca09ce62a0a3732536236 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.32-0" --checksum 4a211faa9436c9747dfc4374cb9e8a7f9b0065dfc58dd4784cef0f5029c2e65e RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.4.25-0" --checksum 94230b4abfeff6424103c40676c7162330c338b03b4f1a77f07eba709e650e35 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.1-1" --checksum 00722b62c7561929e039877a6e445a4bb782c340890c0a090fdae3c9e1960161 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "moodle" "3.11.4-0" --checksum d517741f777db6e0f0ba206dc25bd36c481ead4dccb20a7bec59d9a3c6205544 @@ -29,8 +29,8 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen COPY rootfs / RUN /opt/bitnami/scripts/locales/add-extra-locales.sh -RUN /opt/bitnami/scripts/apache/postunpack.sh 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 @@ -39,7 +39,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="moodle" \ - BITNAMI_IMAGE_VERSION="3.11.4-debian-10-r1" \ + BITNAMI_IMAGE_VERSION="3.11.4-debian-10-r2" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ MARIADB_HOST="mariadb" \ diff --git a/bitnami/moodle/3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/moodle/3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index 3a6bb216d7c0..f48d5c3315c3 100644 --- a/bitnami/moodle/3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/moodle/3/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -29,10 +29,10 @@ }, "mysql-client": { "arch": "amd64", - "digest": "15b394a022ca1d0b4b89bfee0487ee13f9e8cc697d0ca09ce62a0a3732536236", + "digest": "4a211faa9436c9747dfc4374cb9e8a7f9b0065dfc58dd4784cef0f5029c2e65e", "distro": "debian-10", "type": "NAMI", - "version": "10.3.31-2" + "version": "10.3.32-0" }, "php": { "arch": "amd64", diff --git a/bitnami/moodle/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/moodle/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 785d883f325e..459f99c7d1cd 100644 --- a/bitnami/moodle/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/moodle/3/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -178,13 +178,13 @@ web_server_reload() { # Apache-specific flags: # --apache-additional-configuration - Additional vhost configuration (no default) # --apache-before-vhost-configuration - Configuration to add before the directive (no default) -# --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no') +# --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined) # --apache-extra-directory-configuration - Extra configuration for the document root directory # --apache-proxy-address - Address where to proxy requests # --apache-proxy-configuration - Extra configuration for the proxy # --apache-proxy-http-configuration - Extra configuration for the proxy HTTP vhost # --apache-proxy-https-configuration - Extra configuration for the proxy HTTPS vhost -# --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup +# --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup (only allowed when type is not defined) # NGINX-specific flags: # --nginx-additional-configuration - Additional server block configuration (no default) # --nginx-external-configuration - Configuration external to server block (no default) diff --git a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-http-vhost.conf.tpl b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-http-vhost.conf.tpl index 9c0eadc5b6ed..eacc2462307f 100644 --- a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-http-vhost.conf.tpl +++ b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-http-vhost.conf.tpl @@ -1,3 +1,4 @@ +{{http_listen_configuration}} {{before_vhost_configuration}} {{server_name_configuration}} diff --git a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl index bf601e084738..0cbe5e47ca37 100644 --- a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl +++ b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl @@ -1,3 +1,4 @@ +{{https_listen_configuration}} {{before_vhost_configuration}} {{server_name_configuration}} diff --git a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl index ee67cd0d9c26..56780c5d258b 100644 --- a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl +++ b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl @@ -1,3 +1,4 @@ +{{http_listen_configuration}} {{before_vhost_configuration}} {{server_name_configuration}} diff --git a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl index eb1e0e3d6485..2fcc78c01951 100644 --- a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl +++ b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl @@ -1,3 +1,4 @@ +{{https_listen_configuration}} {{before_vhost_configuration}} {{server_name_configuration}} diff --git a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl index 939b06c897f4..854b321ad6ec 100644 --- a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl +++ b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-http-vhost.conf.tpl @@ -1,3 +1,4 @@ +{{http_listen_configuration}} {{before_vhost_configuration}} {{server_name_configuration}} diff --git a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl index 9b555e8acf8b..d8a5352263a6 100644 --- a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl +++ b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-proxy-https-vhost.conf.tpl @@ -1,3 +1,4 @@ +{{https_listen_configuration}} {{before_vhost_configuration}} {{server_name_configuration}} diff --git a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl index 51be5b20f59b..44be06d12aad 100644 --- a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl +++ b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl @@ -1,3 +1,4 @@ +{{http_listen_configuration}} {{before_vhost_configuration}} PassengerPreStart http://localhost:{{http_port}}/ diff --git a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl index 965290090fb2..fdc65c37cee9 100644 --- a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl +++ b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl @@ -1,3 +1,4 @@ +{{https_listen_configuration}} {{before_vhost_configuration}} PassengerPreStart https://localhost:{{https_port}}/ diff --git a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh index a5bc9708b60c..99c18af35cd6 100644 --- a/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh +++ b/bitnami/moodle/3/debian-10/rootfs/opt/bitnami/scripts/libapache.sh @@ -327,10 +327,10 @@ EOF # --disable-https - Whether to render the app's HTTPS virtual host with a .disabled prefix # --http-port - HTTP port number # --https-port - HTTPS port number -# --move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup +# --move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup (only allowed when type is not defined) # --additional-configuration - Additional vhost configuration (no default) # --before-vhost-configuration - Configuration to add before the directive (no default) -# --allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no') +# --allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined) # --document-root - Path to document root directory # --extra-directory-configuration - Extra configuration for the document root directory # --proxy-address - Address where to proxy requests @@ -358,8 +358,10 @@ ensure_apache_app_configuration_exists() { export allow_override="All" export document_root="${BITNAMI_ROOT_DIR}/${app}" export extra_directory_configuration="" - export http_port="${APACHE_HTTP_PORT_NUMBER:-"$APACHE_DEFAULT_HTTP_PORT_NUMBER"}" - export https_port="${APACHE_HTTPS_PORT_NUMBER:-"$APACHE_DEFAULT_HTTPS_PORT_NUMBER"}" + export default_http_port="${APACHE_HTTP_PORT_NUMBER:-"$APACHE_DEFAULT_HTTP_PORT_NUMBER"}" + export default_https_port="${APACHE_HTTPS_PORT_NUMBER:-"$APACHE_DEFAULT_HTTPS_PORT_NUMBER"}" + export http_port="$default_http_port" + export https_port="$default_https_port" export proxy_address="" export proxy_configuration="" export proxy_http_configuration="" @@ -409,6 +411,11 @@ ensure_apache_app_configuration_exists() { esac shift done + # Construct listen ports configuration (only to add when using non-standard ports) + export http_listen_configuration="" + export https_listen_configuration="" + [[ "$http_port" != "$default_http_port" ]] && http_listen_configuration="Listen ${http_port}" + [[ "$https_port" != "$default_https_port" ]] && https_listen_configuration="Listen ${https_port}" # Construct host string in the format of "host1:port1[ host2:port2[ ...]]" export http_listen_addresses="" export https_listen_addresses="" @@ -426,10 +433,10 @@ ensure_apache_app_configuration_exists() { if [[ "${#server_aliases[@]}" -gt 0 ]]; then server_name_configuration+=$'\n'"ServerAlias ${server_aliases[*]}" fi - # App .htaccess support + # App .htaccess support (only when type is not defined) export htaccess_include - is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root" - if [[ -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then + [[ -z "$type" ]] && is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root" + if [[ -z "$type" && -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then allow_override="None" htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\"" else @@ -455,6 +462,7 @@ EOF server_name_configuration="$(indent $'\n'"$server_name_configuration" 2)" additional_configuration="$(indent $'\n'"$additional_configuration" 2)" htaccess_include="$(indent $'\n'"$htaccess_include" 2)" + acl_configuration=""$(indent $'\n'"$acl_configuration" 4) extra_directory_configuration="$(indent $'\n'"$extra_directory_configuration" 4)" proxy_configuration="$(indent $'\n'"$proxy_configuration" 2)" proxy_http_configuration="$(indent $'\n'"$proxy_http_configuration" 2)" @@ -519,10 +527,10 @@ ensure_apache_app_configuration_not_exists() { # Flags: # --type - Application type, which has an effect on what configuration template will be used, allowed values: php, (empty) # --allow-remote-connections - Whether to allow remote connections or to require local connections -# --move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup +# --move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup (only allowed when type is not defined) # --prefix - URL prefix from where it will be accessible (i.e. /myapp) # --additional-configuration - Additional vhost configuration (no default) -# --allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no') +# --allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined) # --document-root - Path to document root directory # --extra-directory-configuration - Extra configuration for the document root directory # Returns: @@ -565,10 +573,10 @@ ensure_apache_prefix_configuration_exists() { esac shift done - # App .htaccess support + # App .htaccess support (only when type is not defined) export htaccess_include - is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root" - if [[ -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then + [[ -z "$type" ]] && is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root" + if [[ -z "$type" && -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then allow_override="None" htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\"" else @@ -643,8 +651,10 @@ apache_update_app_configuration() { local enable_https="no" local disable_http="no" local disable_https="no" - local http_port="${APACHE_HTTP_PORT_NUMBER:-"$APACHE_DEFAULT_HTTP_PORT_NUMBER"}" - local https_port="${APACHE_HTTPS_PORT_NUMBER:-"$APACHE_DEFAULT_HTTPS_PORT_NUMBER"}" + export default_http_port="${APACHE_HTTP_PORT_NUMBER:-"$APACHE_DEFAULT_HTTP_PORT_NUMBER"}" + export default_https_port="${APACHE_HTTPS_PORT_NUMBER:-"$APACHE_DEFAULT_HTTPS_PORT_NUMBER"}" + export http_port="$default_http_port" + export https_port="$default_https_port" local var_name # Validate arguments local var_name @@ -721,7 +731,8 @@ apache_update_app_configuration() { if [[ -e "$http_vhost" ]]; then if is_file_writable "$http_vhost"; then update_common_vhost_config "$http_vhost" - # Update vhost-specific config (listen addresses) + # Update vhost-specific config (listen port and addresses) + replace_in_file "$http_vhost" "^Listen .*" "Listen ${http_port}" replace_in_file "$http_vhost" "^$" "" else warn "The ${app} virtual host file '${http_vhost}' is not writable. Configurations based on environment variables will not be applied for this file." @@ -730,7 +741,8 @@ apache_update_app_configuration() { if [[ -e "$https_vhost" ]]; then if is_file_writable "$https_vhost"; then update_common_vhost_config "$https_vhost" - # Update vhost-specific config (listen addresses) + # Update vhost-specific config (listen port and addresses) + replace_in_file "$https_vhost" "^Listen .*" "Listen ${https_port}" replace_in_file "$https_vhost" "^$" "" else warn "The ${app} virtual host file '${https_vhost}' is not writable. Configurations based on environment variables will not be applied for this file." diff --git a/bitnami/moodle/README.md b/bitnami/moodle/README.md index df36b7511a3b..76768a26f3a4 100644 --- a/bitnami/moodle/README.md +++ b/bitnami/moodle/README.md @@ -37,7 +37,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) 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/). -* [`3`, `3-debian-10`, `3.11.4`, `3.11.4-debian-10-r1`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-moodle/blob/3.11.4-debian-10-r1/3/debian-10/Dockerfile) +* [`3`, `3-debian-10`, `3.11.4`, `3.11.4-debian-10-r2`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-moodle/blob/3.11.4-debian-10-r2/3/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/moodle GitHub repo](https://github.com/bitnami/bitnami-docker-moodle).