Merge branch 'DBP-000-test-moodle-chart' of github.com:dBildungsplatt…

…form/dbp-moodle into DBP-000-test-moodle-chart
dBildungsplattform · Oct 14, 2024 · 07454e3 · 07454e3
2 parents 5fa4c18 + aedc3e5
commit 07454e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/moodle/scripts/init/entrypoint.sh b/moodle/scripts/init/entrypoint.sh
@@ -105,8 +105,8 @@ upgrade_if_pending
 MODULE=dbp info "Replacing config files with ours"
 /bin/cp -p /moodleconfig/config.php /bitnami/moodle/config.php
 /bin/cp /moodleconfig/php.ini /opt/bitnami/php/etc/conf.d/php.ini
-
 upgrade_if_pending
+
 if [[ ! -f "$update_failed_path" ]] && [[ ! -f "$plugin_state_failed_path" ]]; then
     MODULE=dbp info "Starting plugin installation"
     if /scripts/pluginCheck.sh; then

diff --git a/moodle/scripts/init/updateCheck.sh b/moodle/scripts/init/updateCheck.sh
@@ -59,8 +59,7 @@ main() {
     image_version="$APP_VERSION"
 
     if [[ -z "$installed_version" ]]; then
-        MODULE="dbp-update" info "No installed Moodle version detected. Installing Moodle..."
-        install_new_version "$image_version"
+        MODULE="dbp-update" info "No installed Moodle version detected, continuing with bitnami fresh install"
         exit 0
     fi
     comp_result="$(compare_semver "$installed_version" "$image_version")"