fix: Remove hard-coded /bitnami references (WIP!)

WIP. Mostly done but mdl-common isn't done, and all needs testing.

Closes #13.

Author: joshuacurtiss

lib/mdl-common.sh

@@ -162,6 +162,13 @@ function update_config() {
    local -r env_dir="$MDL_ENVS_DIR/$1"
    local -r env_config_file="$env_dir/src/config.php"
 
+   # Get the Moodle container and its mount paths for this environment
+   local -r container="$(container_tool ps -f "label=com.docker.compose.project=$1" --format '{{.Names}}' | grep moodle | head -1)"
+   local -r data_path=${container:+$(container_tool inspect "$container" | jq -r '.[] .Mounts[] | select(.Name != null and (.Name | contains("data"))) | .Destination')}
+   local -r src_path=${container:+$(container_tool inspect "$container" | jq -r '.[] .Mounts[] | select(.Name != null and (.Name | contains("src"))) | .Destination')}
+
+   # TODO: Maybe this isn't necessary anymore if WWWROOT is automatically set in .env files.
+   # TODO: Plus, technically the $env_config_file referenced in this if block is broken.
    # Get desired wwwroot value
    if [ -z "$WWWROOT" ]; then
       local -r defaultwwwroot="$(grep -o -E "CFG->wwwroot\s*=\s*'(.*)';" "$env_config_file" | cut -d"'" -f2)"
@@ -183,6 +190,7 @@ function update_config() {
       source /env/.env
       WWWROOT=$WWWROOT
    "
+   # TODO: Properly handle config `dataroot` updates, excluding if data_path is not known.
    cmd="$cmd $(cat <<'EOF'
       replace_config_value() {
          local content="$1"

libexec/mdl-cli.sh

@@ -53,19 +53,21 @@ mnames=$("$scr_dir"/mdl-select-env.sh "$1")
 
 for mname in $mnames; do
 
-   # Get the Moodle container for this environment
+   # Get the Moodle container and base directory for this environment
    container="$(container_tool ps -f "label=com.docker.compose.project=$mname" --format '{{.Names}}' | grep moodle | head -1)"
    [[ -z $container ]] && echo "${red}Could not find a container running Moodle for $ul$mname$rmul!$norm" >&2 && exit 1
+   base_dir=$(container_tool inspect "$container" | jq -r '.[] .Mounts[] | select(.Name != null and (.Name | contains("src"))) | .Destination')
+   [[ -z $base_dir ]] && echo "${red}Could not determine Moodle base directory for $ul$mname$rmul!$norm" >&2 && exit 1
 
    cmd="$2"
    # If they did not provide a cmd, list the available commands
    if [[ -z $cmd ]]; then
       echo "${bold}${ul}Available Commands$norm"
-      container_tool exec -t "$container" find /bitnami/moodle/admin/cli -maxdepth 1 -type f -exec basename {} .php \; | sort | sed 's/^/  - /'
+      container_tool exec -t "$container" find "$base_dir/admin/cli" -maxdepth 1 -type f -exec basename {} .php \; | sort | sed 's/^/  - /'
       exit
    fi
 
    # Run the command, passing any additional arguments they passed on to this script
-   container_tool exec $paramI -t "$container" php "/bitnami/moodle/admin/cli/$cmd.php" "${@:3}"
+   container_tool exec $paramI -t "$container" php "$base_dir/admin/cli/$cmd.php" "${@:3}"
 
 done

libexec/mdl-init.sh

@@ -318,10 +318,12 @@ if [[ -n $mname ]]; then
             fi
          done
          echo
-         # Start the environment. Bitnami image will automatically bootstrap install. Wait to finish.
+         # Start the environment, automatically bootstrapping install. Wait to finish.
          branchver="$branchver" "$scr_dir/mdl-start.sh" "$mname" -q
          moodle_svc=$(container_tool ps --filter "label=com.docker.compose.project=$mname" --format '{{.Names}}' | grep moodle)
          src_vol_name=$(container_tool volume ls -q --filter "label=com.docker.compose.project=$mname" | grep src)
+         src_path=$(container_tool inspect "$moodle_svc" | jq -r '.[] .Mounts[] | select(.Name != null and (.Name | contains("src"))) | .Destination')
+         data_path=$(container_tool inspect "$moodle_svc" | jq -r '.[] .Mounts[] | select(.Name != null and (.Name | contains("data"))) | .Destination')
          # Do git install once standard install completes.
          function git_cmd() {
             container_tool run --rm -t --name "$mname-git-$(uuidgen)" -v "$src_vol_name":/git "$MDL_GIT_IMAGE" -c safe.directory=/git "$@"
@@ -359,7 +361,7 @@ if [[ -n $mname ]]; then
                }
                !skip { print }
             '
-            config_file=/bitnami/moodle/config.php
+            config_file=$src_path/config.php
             revised_config_file=$(mktemp)
             container_tool exec -it "$moodle_svc" awk "$awk_cmd" "$config_file" > "$revised_config_file"
             container_tool cp "$revised_config_file" "$moodle_svc":"$config_file"
@@ -382,13 +384,13 @@ if [[ -n $mname ]]; then
          "$scr_dir/mdl-cli.sh" "$mname" upgrade --non-interactive
          # After upgrades, we need to fix permissions.
          # Ref: https://docs.moodle.org/4x/sv/Security_recommendations#Running_Moodle_on_a_dedicated_server
-         container_tool exec -it "${moodle_svc}" bash -c '
-            chown -R daemon:daemon /bitnami/moodle /bitnami/moodledata
-            find /bitnami/moodle -type d -print0 | xargs -0 chmod 755
-            find /bitnami/moodle -type f -print0 | xargs -0 chmod 644
-            find /bitnami/moodledata -type d -print0 | xargs -0 chmod 700
-            find /bitnami/moodledata -type f -print0 | xargs -0 chmod 600
-         '
+         container_tool exec -it "${moodle_svc}" bash -c "
+            chown -R daemon:daemon '$src_path' '$data_path'
+            find '$src_path' -type d -print0 | xargs -0 chmod 755
+            find '$src_path' -type f -print0 | xargs -0 chmod 644
+            find '$data_path' -type d -print0 | xargs -0 chmod 700
+            find '$data_path' -type f -print0 | xargs -0 chmod 600
+         "
       fi
       echo 🎉 Done!
    else

libexec/mdl-restore.sh

@@ -186,7 +186,7 @@ for mname in $mnames; do
             -e MARIADB_DATABASE="${DB_NAME:-moodle}" \
             -e MARIADB_COLLATE=utf8mb4_unicode_ci \
             -e MARIADB_SKIP_TEST_DB=yes \
-            -v "$db_vol_name":/bitnami/mariadb/data \
+            -v "$db_vol_name":"$db_path" \
             -v "$sql_path":/docker-entrypoint-initdb.d/restore.sql:Z,ro \
             "$MARIADB_IMAGE" > /dev/null
          # MariaDB doesn't have a "run task and exit" mode, so we just wait until
@@ -201,6 +201,9 @@ for mname in $mnames; do
       pid_db=$!
    fi
 
+   # Update Moodle config
+   export_env_and_update_config "$mname"
+
    # When done, clean up. Down the stack and remove the temp volume.
    wait $pid_src
    container_tool volume rm -f "$temp_vol_name" > /dev/null
@@ -213,9 +216,6 @@ for mname in $mnames; do
       rm -fv "$MDL_BACKUP_DIR/$data_target" "$MDL_BACKUP_DIR/$src_target" "$MDL_BACKUP_DIR/$db_target"
    fi
 
-   # Update Moodle config
-   export_env_and_update_config "$mname"
-
    echo "Done restoring $ul$mname$rmul from $backup_source_desc backup set with label $ul$label$norm."
 
    # Unset environment variables