From b1ec4a90d6414901f6d193f435d1bfded87502a3 Mon Sep 17 00:00:00 2001 From: Deckard Date: Mon, 20 Oct 2025 01:08:53 -0400 Subject: [PATCH] update status message and update migration --- scripts/migrate-stack.sh | 5 +++++ status.sh | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/migrate-stack.sh b/scripts/migrate-stack.sh index 264608f..7ea415a 100755 --- a/scripts/migrate-stack.sh +++ b/scripts/migrate-stack.sh @@ -101,6 +101,11 @@ echo "⋅ Loading images on remote" run_scp "$TARBALL" "$USER@$HOST:/tmp/acore-modules-images.tar" run_ssh "docker load < /tmp/acore-modules-images.tar && rm /tmp/acore-modules-images.tar" +if [[ -f .env ]]; then + echo "⋅ Uploading .env" + run_scp .env "$USER@$HOST:$PROJECT_DIR/.env" +fi + echo "⋅ Remote prepares completed" echo "Run on the remote host to deploy:" echo " cd $PROJECT_DIR && ./deploy.sh --skip-rebuild --no-watch" diff --git a/status.sh b/status.sh index 5193770..cbed257 100755 --- a/status.sh +++ b/status.sh @@ -147,12 +147,12 @@ print_service(){ state_info="$(format_state "$status" "$health" "$started" "$exit_code")" colour="${state_info%%|*}" text="${state_info#*|}" - printf "%-20s %b%-30s%b %s\n" "$label" "$colour" "$text" "$NC" "$(short_image "$image")" + printf "%-20s %-15s %b%-30s%b %s\n" "$label" "$container" "$colour" "$text" "$NC" "$(short_image "$image")" if [ "$SHOW_LOGS" = true ]; then docker logs "$container" --tail "$LOG_LINES" 2>/dev/null | sed 's/^/ /' || printf " (no logs available)\n" fi else - printf "%-20s %b%-30s%b %s\n" "$label" "$RED" "○ missing" "$NC" "-" + printf "%-20s %-15s %b%-30s%b %s\n" "$label" "$container" "$RED" "○ missing" "$NC" "-" fi } @@ -263,8 +263,8 @@ show_realm_status_header(){ render_snapshot(){ show_realm_status_header printf "\nTIME %s PROJECT %s\n\n" "$(date '+%Y-%m-%d %H:%M:%S')" "$PROJECT_NAME" - printf "%-20s %-28s %s\n" "SERVICE" "STATE" "IMAGE" - printf "%-20s %-28s %s\n" "--------------------" "----------------------------" "------------------------------" + printf "%-20s %-15s %-28s %s\n" "SERVICE" "CONTAINER" "STATE" "IMAGE" + printf "%-20s %-15s %-28s %s\n" "--------------------" "---------------" "----------------------------" "------------------------------" print_service ac-mysql "MySQL" print_service ac-backup "Backup" print_service ac-db-init "DB Init"