From 9b6f1e639f4e6ccce78dba51b055599f2c3343a5 Mon Sep 17 00:00:00 2001
From: hotwa <pylyzeng@gmail.com>
Date: Tue, 30 Sep 2025 20:59:29 +0800
Subject: [PATCH] use v2ray logsangle

---
 .gitea/workflows/build-and-push.yml | 21 ++++++++------
 v2ray-client.json                   | 43 +++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 v2ray-client.json

diff --git a/.gitea/workflows/build-and-push.yml b/.gitea/workflows/build-and-push.yml
index 7edef9b..9e778fb 100644
--- a/.gitea/workflows/build-and-push.yml
+++ b/.gitea/workflows/build-and-push.yml
@@ -43,6 +43,15 @@ jobs:
           docker logout "$ACR_REGISTRY" || true
           echo "$ACR_PASSWORD" | docker login "$ACR_REGISTRY" --username "$ACR_USERNAME" --password-stdin
 
+      - name: Start v2ray-client
+        run: |
+          docker rm -f v2ray-client >/dev/null 2>&1 || true
+          docker run -d --name v2ray-client \
+            --network host \
+            -v ${{ github.workspace }}/v2ray-client.json:/etc/v2ray/config.json:ro \
+            v2fly/v2fly-core:latest \
+            run -c /etc/v2ray/config.json
+
       - name: Build Docker Image (host network; no Dockerfile change)
         env:
           IMAGE: ${{ secrets.ACR_REGISTRY }}/${{ secrets.ACR_NAMESPACE }}/${{ vars.IMAGE_NAME }}
@@ -50,18 +59,15 @@ jobs:
         run: |
           set -euo pipefail
 
-          # 1) 重新创建并启用 buildx builder：共享宿主机网络 + 注入代理环境
           docker buildx rm ci-builder >/dev/null 2>&1 || true
           docker buildx create \
             --name ci-builder --use \
             --driver docker-container \
             --driver-opt network=host \
-            --driver-opt env.http_proxy=http://127.0.0.1:7890,env.https_proxy=http://127.0.0.1:7890 \
+            --driver-opt env.http_proxy=http://127.0.0.1:8080,env.https_proxy=http://127.0.0.1:8080 \
             --buildkitd-flags '--allow-insecure-entitlement network.host' \
             >/dev/null
 
-          # 2) 构建：允许 host 网络，让 RUN 阶段可直接访问 127.0.0.1:7890
-          #    用 --load 让镜像回到本地 daemon，便于下一步 docker push
           echo "Building ${IMAGE}:${TAG}"
           docker buildx build \
             --builder ci-builder \
@@ -70,10 +76,9 @@ jobs:
             --load \
             -t "${IMAGE}:${TAG}" -f docker/Dockerfile .
 
-          # 可选：main 分支或 release 时也打 latest
-          if [ "${{ github.event_name }}" = "release" ] || [ "${{ github.ref_name }}" = "main" ]; then
-            docker tag "${IMAGE}:${TAG}" "${IMAGE}:latest"
-          fi
+      - name: Stop v2ray-client
+        if: always()   # 确保出错也能清理
+        run: docker rm -f v2ray-client || true
 
       - name: Push Docker Image
         env:
diff --git a/v2ray-client.json b/v2ray-client.json
new file mode 100644
index 0000000..fee05ef
--- /dev/null
+++ b/v2ray-client.json
@@ -0,0 +1,43 @@
+{
+  "log": {
+    "loglevel": "info"
+  },
+  "inbounds": [
+    {
+      "port": 1080,
+      "listen": "0.0.0.0",
+      "protocol": "socks",
+      "settings": { "auth": "noauth", "udp": true }
+    },
+    {
+      "port": 8080,
+      "listen": "0.0.0.0",
+      "protocol": "http",
+      "settings": {}
+    }
+  ],
+  "outbounds": [
+    {
+      "protocol": "vless",
+      "settings": {
+        "vnext": [
+          {
+            "address": "molecular.eu.org",
+            "port": 443,
+            "users": [
+              { "id": "8f5e3b57-5a3d-4a3e-9f3c-9c6c2d6a9f1e", "encryption": "none" }
+            ]
+          }
+        ]
+      },
+      "streamSettings": {
+        "network": "grpc",
+        "security": "tls",
+        "grpcSettings": {
+          "serviceName": "grpc",
+          "multiMode": true
+        }
+      }
+    }
+  ]
+}