From 7e8d79fad36b68c49ba86f38ac851cb60ba6cb78 Mon Sep 17 00:00:00 2001
From: hotwa <pylyzeng@gmail.com>
Date: Tue, 30 Sep 2025 21:33:52 +0800
Subject: [PATCH] test1

---
 .gitea/workflows/build-and-push.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/build-and-push.yml b/.gitea/workflows/build-and-push.yml
index bb25d94..32bc01b 100644
--- a/.gitea/workflows/build-and-push.yml
+++ b/.gitea/workflows/build-and-push.yml
@@ -43,7 +43,7 @@ jobs:
           docker logout "$ACR_REGISTRY" || true
           echo "$ACR_PASSWORD" | docker login "$ACR_REGISTRY" --username "$ACR_USERNAME" --password-stdin
 
-      - name: Start v2ray-client (write + run + verify + logs)
+      - name: Start v2ray-client (write + verify + run + logs)
         env:
           V2RAY_JSON: ${{ secrets.V2RAY_JSON }}
         run: |
@@ -54,14 +54,15 @@ jobs:
           printf '%s' "$V2RAY_JSON" > "${GITHUB_WORKSPACE}/v2ray/config.json"
           jq . "${GITHUB_WORKSPACE}/v2ray/config.json" >/dev/null
 
-          # 2) 先用一次性容器验证“容器里是否能读到文件”
+          # 2) 用一次性容器验证：覆盖 entrypoint 才能用 sh
           docker run --rm \
             --network host \
             --mount type=bind,src=${GITHUB_WORKSPACE}/v2ray,dst=/etc/v2ray,ro \
+            --entrypoint sh \
             v2fly/v2fly-core:latest \
-            sh -lc 'ls -l /etc/v2ray && head -n2 /etc/v2ray/config.json || true'
+            -lc 'ls -l /etc/v2ray && head -n2 /etc/v2ray/config.json || true'
 
-          # 3) 真正启动
+          # 3) 启动真实服务
           docker rm -f v2ray-client >/dev/null 2>&1 || true
           docker run -d --name v2ray-client \
             --network host \
@@ -69,7 +70,7 @@ jobs:
             v2fly/v2fly-core:latest \
             run -c /etc/v2ray/config.json -format jsonv5
 
-          # 4) 等 1 秒看状态，失败就打日志
+          # 4) 健康检查；若退出则打印日志并失败
           sleep 1
           if [ "$(docker inspect -f '{{.State.Running}}' v2ray-client 2>/dev/null)" != "true" ]; then
             echo "== v2ray-client exited; logs =="
@@ -81,6 +82,7 @@ jobs:
           docker inspect -f '{{range .Mounts}}{{println .Type .Source "->" .Destination}}{{end}}' v2ray-client
 
 
+
       - name: Build Docker Image (host network; no Dockerfile change)
         env:
           IMAGE: ${{ secrets.ACR_REGISTRY }}/${{ secrets.ACR_NAMESPACE }}/${{ vars.IMAGE_NAME }}