Refactor service scripts and update final report generation

- Renamed and reorganized service scripts: `05_run_services.sh` is now `06_run_services.sh`, and `06_final_report.sh` is now `07_final_report.sh`.
- Updated references in documentation and other scripts to reflect the new script names.
- Enhanced the final report script to include access details for newly integrated services, ensuring comprehensive output for users.
This commit is contained in:
Yury Kossakovsky
2025-08-28 17:54:52 -06:00
parent 9e1b89a651
commit 2b3b602fa7
16 changed files with 34 additions and 34 deletions

View File

View File

@@ -12,8 +12,8 @@ COMPOSE_CMD="docker compose"
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
# Project root directory (one level up from scripts)
PROJECT_ROOT="$( cd "$SCRIPT_DIR/.." &> /dev/null && pwd )"
# Path to the 05_run_services.sh script (Corrected from original update.sh which had 04)
RUN_SERVICES_SCRIPT="$SCRIPT_DIR/05_run_services.sh"
# Path to the 06_run_services.sh script (Corrected from original update.sh which had 04)
RUN_SERVICES_SCRIPT="$SCRIPT_DIR/06_run_services.sh"
# Compose files (Not strictly needed here unless used directly, but good for context)
# MAIN_COMPOSE_FILE="$PROJECT_ROOT/docker-compose.yml"
# SUPABASE_COMPOSE_FILE="$PROJECT_ROOT/supabase/docker/docker-compose.yml"
@@ -70,14 +70,14 @@ $COMPOSE_CMD -p "localai" "${COMPOSE_FILES_FOR_PULL[@]}" pull --ignore-buildable
exit 1
}
# Start services using the 05_run_services.sh script
# Start services using the 06_run_services.sh script
log_info "Running Services..."
bash "$RUN_SERVICES_SCRIPT" || { log_error "Failed to start services. Check logs for details."; exit 1; }
log_success "Update application completed successfully!"
# --- Display Final Report with Credentials ---
bash "$SCRIPT_DIR/06_final_report.sh" || {
bash "$SCRIPT_DIR/07_final_report.sh" || {
log_warning "Failed to display the final report. This does not affect the update."
# We don't exit 1 here as the update itself was successful.
}

View File

@@ -37,8 +37,8 @@ required_scripts=(
"02_install_docker.sh"
"03_generate_secrets.sh"
"04_wizard.sh"
"05_run_services.sh"
"06_final_report.sh"
"06_run_services.sh"
"07_final_report.sh"
)
missing_scripts=()
@@ -98,7 +98,7 @@ bash "$SCRIPT_DIR/04_wizard.sh" || { log_error "Service Selection Wizard failed"
log_success "Service Selection Wizard complete!"
log_info "========== STEP 5: Running Services =========="
bash "$SCRIPT_DIR/05_run_services.sh" || { log_error "Running Services failed"; exit 1; }
bash "$SCRIPT_DIR/06_run_services.sh" || { log_error "Running Services failed"; exit 1; }
log_success "Running Services complete!"
log_info "========== STEP 6: Generating Final Report =========="
@@ -112,7 +112,7 @@ log_success "- Docker and Docker Compose installed"
log_success "- '.env' generated with secure passwords and secrets"
log_success "- Services launched via Docker Compose"
bash "$SCRIPT_DIR/06_final_report.sh" || { log_error "Final Report Generation failed"; exit 1; }
bash "$SCRIPT_DIR/07_final_report.sh" || { log_error "Final Report Generation failed"; exit 1; }
log_success "Final Report Generation complete!"
exit 0