From 61d7970b6a5212398f177a7d4b9e9c276205e58e Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 5 Jan 2026 09:35:39 +0000
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20remove=5Fby=5Fnetw?=
 =?UTF-8?q?ork=20=E5=87=BD=E6=95=B0=E4=BB=A5=E5=88=A0=E9=99=A4=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E7=8A=B6=E6=80=81=E7=9A=84=E5=AE=B9=E5=99=A8=E5=B9=B6?=
 =?UTF-8?q?=E7=AD=89=E5=BE=85=E7=BD=91=E7=BB=9C=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/cmd b/cmd
index dfa88cae6..d21b520d2 100755
--- a/cmd
+++ b/cmd
@@ -304,9 +304,22 @@ mysql_snapshot() {
 remove_by_network() {
     local app_id=$(env_get APP_ID)
     local network_name="dootask-networks-${app_id}"
-    for container_id in $(docker ps -q --filter network="$network_name"); do
+
+    # 删除所有状态的容器（包括已停止的）
+    for container_id in $(docker ps -aq --filter network="$network_name"); do
         docker rm -f "$container_id" 1>/dev/null
     done
+
+    # 等待网络完全清空（最多等待10秒）
+    local retry=0
+    while [ $retry -lt 10 ]; do
+        local count=$(docker network inspect "$network_name" --format '{{len .Containers}}' 2>/dev/null | tr -d '[:space:]')
+        if [ -z "$count" ] || [ "$count" = "0" ]; then
+            break
+        fi
+        sleep 1
+        ((retry++))
+    done
 }
 
 # 自动配置https