WIP: Allow specification of DocumentRoot with intelligent fallback

Author: andrewnicols

Dockerfile

@@ -46,9 +46,19 @@ RUN mkdir /var/www/moodledata && chown www-data /var/www/moodledata && \
 
 ADD root/usr /usr
 ADD root/etc /etc
+ADD root/system-docker-entrypoint.d/wwwroot.sh /system-docker-entrypoint.d/10-wwwroot.sh
 
 # Fix the original permissions of /tmp, the PHP default upload tmp dir.
 RUN chmod 777 /tmp && chmod +t /tmp
 
+# Allow configuration of the Apache DocumentRoot via environment variable.
+# Note: Do not specify a default value here, as it will be set in the
+#       `wwwroot.sh` script, which will be run before the Apache server starts.
+#       This allows the user to override the default value by setting the
+#       `APACHE_DOCUMENT_ROOT` environment variable when running the container.
+
+RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
+RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
+
 CMD ["apache2-foreground"]
 ENTRYPOINT ["moodle-docker-php-entrypoint"]

README.md

@@ -41,7 +41,7 @@ $ docker run --name web0 -p 8080:80  -v $PWD:/var/www/html moodlehq/moodle-php-a
 
 ## Features
 * Preconfigured with all php extensions required for Moodle development and all database drivers
-* Serves wwwroot configured at /var/www/html/
+* Serves using the `APACHE_DOCUMENT_ROOT` environment variable for the`DocumentRoot`, with a default value of`/var/www/html/`
 * For PHP 7.3 and up, both `linux/amd64` and `linux/arm64` images are being built. Note that `linux/arm64` doesn't support the sqlsrv and oci extensions yet. Other than that, both architectures work exactly the same.
 * Verified by [automated tests](https://travis-ci.com/moodlehq/moodle-php-apache).
 * Autobuilt from GHA, on push.

root/system-docker-entrypoint.d/wwwroot.sh

@@ -0,0 +1,27 @@
+echo
+echo "#######################################"
+echo "# moodle-php-apache wwwroot setup"
+echo "#######################################"
+echo "#"
+echo "# Setting up Apache DocumentRoot"
+
+if [ -z "$APACHE_DOCUMENT_ROOT" ]; then
+    echo "# No value set for \$APACHE_DOCUMENT_ROOT. Creating default value."
+    export APACHE_DOCUMENT_ROOT=/var/www/html
+
+    if [ -d "$APACHE_DOCUMENT_ROOT/public" ]; then
+        echo "# Detected /public directory."
+        echo "# Using /var/www/html/public"
+        export APACHE_DOCUMENT_ROOT="$APACHE_DOCUMENT_ROOT/public"
+    else
+        echo "# Using default Apache DocumentRoot: /var/www/html"
+    fi
+
+else
+    echo "# A value was provided as an environment variable"
+fi
+
+echo "# \$APACHE_DOCUMENT_ROOT: $APACHE_DOCUMENT_ROOT"
+echo "#"
+echo "#######################################"
+echo

root/usr/local/bin/moodle-docker-php-entrypoint

@@ -31,8 +31,16 @@ echo "Running PHP Configuration fetcher"
 /usr/local/bin/moodle-docker-php-ini
 echo
 
-echo "Running entrypoint files from /docker-entrypoint.d/*"
-docker_process_init_files /docker-entrypoint.d/*
+mkdir -p /system-docker-entrypoint.d  /docker-entrypoint.d /final-docker-entrypoint.d
+echo "Building Entrypoint files from /system-docker-entrypoint.d/* and /docker-entrypoint.d/*"
+
+echo "Copying /system-docker-entrypoint.d/* to /final-docker-entrypoint.d/"
+cp -rf /system-docker-entrypoint.d/* /final-docker-entrypoint.d/ || true
+echo "Copying /docker-entrypoint.d/* to /final-docker-entrypoint.d/"
+cp -rf /docker-entrypoint.d/* /final-docker-entrypoint.d/ || true
+
+echo "Running entrypoint files from /final-docker-entrypoint.d/*"
+docker_process_init_files /final-docker-entrypoint.d/*
 echo
 
 echo "Starting docker-php-entrypoint with $@"