diff --git a/devbox/cli/devbox b/devbox/cli/devbox index 5adb2e4..5e21e0b 100755 --- a/devbox/cli/devbox +++ b/devbox/cli/devbox @@ -690,8 +690,8 @@ EOFinner sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=http://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development - sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development - sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=http://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development + sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.dev + sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=http://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.dev else # Online component environment variables echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Use online component dev environment." @@ -722,12 +722,17 @@ else export VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com EOFinner # Update set VITE_PROXY_WEBSOCKET_CHAT_URL and VITE_PROXY_API_CHAT_URL in frontend/.env.development and frontend/.env.dev + echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Update VITE_PROXY_WEBSOCKET_CHAT_URL and VITE_PROXY_API_CHAT_URL in frontend/.env.development and frontend/.env.dev" sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.dev sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.dev + + tail -n 20 /home/devbox/freeleaps/frontend/freeleaps/.env.development + tail -n 20 /home/devbox/freeleaps/frontend/freeleaps/.env.dev + echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Online component dev environment variables set." fi if true ; then @@ -824,9 +829,12 @@ if true ; then echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Git status check completed." echo - + # 6️⃣ Reset git status + echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Resetting git status..." + git reset --hard HEAD + git clean -fd + echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Git status reset completed." echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Backend and frontend environment initialization completed." - fi EOF @@ -1173,11 +1181,16 @@ docker exec -i "$DEVBOX_NAME" bash < /dev/null - source /home/devbox/freeleaps/apps/.env # Record the git status baseline before compilation baseline_frontend=\$(mktemp) @@ -1201,6 +1214,32 @@ docker exec -i "$DEVBOX_NAME" bash </dev/null || true + docker rm "$gitea_container_id" &>/dev/null || true fi # Stop and remove MongoDB container @@ -2190,6 +2239,16 @@ devbox_deinit_command() { fi rm -f "$WORKING_HOME/.mongodb-instance" + + elif [[ -n "$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-mongodb\$")" ]]; then + # If the MongoDB container is still running, stop and remove it + log_info "MongoDB container is stopped." + local mongodb_container_id + mongodb_container_id=$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-mongodb\$") + + log_info "Stopping and removing MongoDB container: $mongodb_container_id" + docker stop "$mongodb_container_id" &>/dev/null || true + docker rm "$mongodb_container_id" &>/dev/null || true fi if [[ -f "$WORKING_HOME/.redis-instance" ]]; then @@ -2206,6 +2265,16 @@ devbox_deinit_command() { fi rm -f "$WORKING_HOME/.redis-instance" + elif [[ -n "$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-redis\$")" ]]; then + # If the Redis container is still running, stop and remove it + log_info "Redis container is stopped." + local redis_container_id + redis_container_id=$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-redis\$") + + log_info "Stopping and removing Redis container: $redis_container_id" + docker stop "$redis_container_id" &>/dev/null || true + docker rm "$redis_container_id" &>/dev/null || true + fi # Stop and remove RabbitMQ container @@ -2223,6 +2292,15 @@ devbox_deinit_command() { fi rm -f "$WORKING_HOME/.rabbitmq-instance" + elif [[ -n "$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-rabbitmq\$")" ]]; then + # If the RabbitMQ container is still running, stop and remove it + log_info "RabbitMQ container is stopped." + local rabbitmq_container_id + rabbitmq_container_id=$(docker ps -a --format '{{.Names}}' | grep "^freeleaps2-rabbitmq\$") + + log_info "Stopping and removing RabbitMQ container: $rabbitmq_container_id" + docker stop "$rabbitmq_container_id" &>/dev/null || true + docker rm "$rabbitmq_container_id" &>/dev/null || true fi # Stop and remove other components @@ -2242,6 +2320,15 @@ devbox_deinit_command() { fi rm -f "$WORKING_HOME/.${component}-instance" + elif [[ -n "$(docker ps -a --format '{{.Names}}' | grep "^$component\$")" ]]; then + # If the component is still running, stop and remove it + log_info "${component} container is stopped." + local component_container_id + component_container_id=$(docker ps -a --format '{{.Names}}' | grep "^$component\$") + + log_info "Stopping and removing ${component} container: $component_container_id" + docker stop "$component_container_id" &>/dev/null || true + docker rm "$component_container_id" &>/dev/null || true fi done