From af11dfc2b7874bc275c527e2556d730710b43234 Mon Sep 17 00:00:00 2001 From: "zhangkun9038@dingtalk.com" Date: Fri, 8 Aug 2025 18:12:22 +0800 Subject: [PATCH] fix live.sh --- config_examples/live.json | 22 +++++++++++----------- tools/live.sh | 39 ++++++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/config_examples/live.json b/config_examples/live.json index 70588297..901275da 100644 --- a/config_examples/live.json +++ b/config_examples/live.json @@ -18,35 +18,35 @@ "timeout": 20000 }, "pair_whitelist": [ + "AAVE/USDT", "ADA/USDT", + "APT/USDT", + "ARB/USDT", "AVAX/USDT", "BCH/USDT", "BNB/USDT", - "BONK/USDT", "BTC/USDT", - "CFX/USDT", "CRV/USDT", "DOGE/USDT", + "ETC/USDT", "ETH/USDT", + "FIL/USDT", "HBAR/USDT", - "ILV/USDT", - "LDO/USDT", - "LINK/USDT", + "IP/USDT", "LTC/USDT", - "MAGIC/USDT", - "ONDO/USDT", - "OP/USDT", - "PENGU/USDT", + "NEAR/USDT", "PEPE/USDT", + "PI/USDT", + "SHIB/USDT", "SOL/USDT", + "STETH/USDT", "SUI/USDT", "TON/USDT", "TRUMP/USDT", "TRX/USDT", "UNI/USDT", - "VINE/USDT", "WIF/USDT", - "WLD/USDT", + "XLM/USDT", "XRP/USDT" ], "pair_blacklist": [] diff --git a/tools/live.sh b/tools/live.sh index 4e41af8f..901b0369 100755 --- a/tools/live.sh +++ b/tools/live.sh @@ -120,22 +120,31 @@ remove_existing_container() { return fi - # 检查容器是否存在 - if docker ps -a --format '{{.Names}}' | grep -q "^${container_name}$"; then - echo "发现同名容器 $container_name,正在停止并移除..." >&2 - # 停止容器 - if ! docker stop "$container_name" >&2; then - echo "⚠️ 停止容器 $container_name 失败,尝试强制移除..." >&2 - fi - # 移除容器 - if docker rm "$container_name" >&2; then - echo "✅ 已成功移除容器 $container_name" >&2 - else - echo "❌ 移除容器 $container_name 失败,请手动处理" >&2 - exit 1 - fi + # 查找以 freqtrade-dryrun 开头的所有容器 + matching_containers=$(docker ps -a --format '{{.Names}}' | grep '^freqtrade-dryrun') + + if [ -n "$matching_containers" ]; then + echo "发现以下以 freqtrade-dryrun 开头的容器: $matching_containers" >&2 + + # 遍历每个匹配的容器并执行停止和删除操作 + for container in $matching_containers; do + echo "正在停止并移除容器: $container" >&2 + + # 停止容器 + if ! docker stop "$container" >&2; then + echo "⚠️ 停止容器 $container 失败,尝试强制移除..." >&2 + fi + + # 移除容器 + if docker rm "$container" >&2; then + echo "✅ 已成功移除容器 $container" >&2 + else + echo "❌ 移除容器 $container 失败,请手动处理" >&2 + exit 1 + fi + done else - echo "未发现同名容器 $container_name,无需移除" >&2 + echo "未发现以 freqtrade-dryrun 开头的容器,无需移除" >&2 fi }