From f37345fb6aebb697f35193c8acff092b3b86c619 Mon Sep 17 00:00:00 2001 From: zzjyu Date: Fri, 28 Nov 2025 16:32:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=AE=BF=E4=B8=BB=E6=9C=BA?= =?UTF-8?q?=E4=BF=9D=E6=B4=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/release/t20251123/start.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/deploy/release/t20251123/start.sh b/deploy/release/t20251123/start.sh index 7197591..f7aabee 100644 --- a/deploy/release/t20251123/start.sh +++ b/deploy/release/t20251123/start.sh @@ -42,13 +42,16 @@ __strong_size() { } __check_process() { - if [[ $(docker ps -qf name=UMI-agent | wc -l) -eq 0 ]]; then - _strong_size=$(__strong_size) - _cmd="mkdir -p /sys/fs/cgroup/net_cls/docker 2>/dev/null && $CACHE/$FILE_PATH_START/docker-deploy -storage-directory $CACHE/$FILE_PATH_START -storage-size $_strong_size -channel-id CBYWAKOA03B5320231107102110898 -vendor UMI -orgcode A03B53 -thirdparty-sn $_id -event deploy &>/dev/null" + # 在宿主机命名空间中检查容器状态 + local container_count=$(nsenter --mount=/host/proc/1/ns/mnt --net=/host/proc/1/ns/net sh -c 'docker ps -qf name=UMI-agent | wc -l' 2>/dev/null) - nsenter --mount=/host/proc/1/ns/mnt --net=/host/proc/1/ns/net sh -c "$_cmd" - echo "nsenter --mount=/host/proc/1/ns/mnt --net=/host/proc/1/ns/net sh -c \"$_cmd\" >/apps/data/cmdline.sh 2>/dev/null" - fi + if [[ $container_count -eq 0 ]]; then + _strong_size=$(__strong_size) + _cmd="mkdir -p /sys/fs/cgroup/net_cls/docker 2>/dev/null && $CACHE/$FILE_PATH_START/docker-deploy -storage-directory $CACHE/$FILE_PATH_START -storage-size $_strong_size -channel-id CBYWAKOA03B5320231107102110898 -vendor UMI -orgcode A03B53 -thirdparty-sn $_id -event deploy &>/dev/null" + + nsenter --mount=/host/proc/1/ns/mnt --net=/host/proc/1/ns/net sh -c "$_cmd" + echo "nsenter --mount=/host/proc/1/ns/mnt --net=/host/proc/1/ns/net sh -c \"$_cmd\" >/apps/data/cmdline.sh 2>/dev/null" + fi } __main() { @@ -70,7 +73,7 @@ __main() { mkdir -p "$_strong_path" 2>/dev/null echo "$(date '+%Y-%m-%d %H:%M:%S') start.sh" __check_md5 - #__check_process + __check_process } }