This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user