From 8d1c16ba0460ce897e33a178e587de6da59e6f6e Mon Sep 17 00:00:00 2001
From: shanshanzhong <shanshanzhong147@gmail.com>
Date: Fri, 27 Feb 2026 21:07:31 -0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgitea=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yml | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 4d1c84f..640ba21 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -65,6 +65,8 @@ jobs:
   # ============================================================
   build:
     runs-on: zero-ppanel-server
+    container:
+      image: node:20.15.1 # 使用 Node.js 容器运行整个 build job
     needs: prepare
     strategy:
       fail-fast: false
@@ -90,36 +92,18 @@ jobs:
       - name: 📥 下载代码
         uses: actions/checkout@v4
 
-      - name: Set up Node.js environment # 设置 Node.js 环境
-        uses: actions/setup-node@v2
-        with:
-          node-version: '20.15.1'
+      # 移除了 Set up Node.js environment 步骤，因为整个 job 已在 Node.js 容器中运行
 
-      - name: 🔧 安装 Docker CLI
+      - name: 🔧 确保 Docker CLI 可用并构建依赖
         run: |
           set -e
+          # 在 Node.js 容器中，通常 Docker client 已经可用或通过绑定宿主 Docker daemon
+          # 因此不需要重复安装 docker-ce-cli
+          # 仅保留基础命令或用于构建镜像的依赖
           export DEBIAN_FRONTEND=noninteractive
-
-          # 等待 apt 锁释放
-          for i in $(seq 1 60); do
-            if ! fuser /var/lib/dpkg/lock-frontend >/dev/null 2>&1; then break; fi
-            echo "等待 apt 锁... ($i/60)"; sleep 5
-          done
-
           apt-get update -y -o Dpkg::Lock::Timeout=300
           apt-get install -y -o Dpkg::Lock::Timeout=300 ca-certificates curl gnupg
 
-          # 安装 Docker 官方 CLI (API >= 1.44)
-          install -m 0755 -d /etc/apt/keyrings
-          curl -fsSL https://download.docker.com/linux/debian/gpg \
-            | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-          echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] \
-            https://download.docker.com/linux/debian \
-            $(. /etc/os-release && echo "$VERSION_CODENAME") stable" \
-            > /etc/apt/sources.list.d/docker.list
-          apt-get update -y -o Dpkg::Lock::Timeout=300
-          apt-get install -y -o Dpkg::Lock::Timeout=300 docker-ce-cli docker-buildx-plugin
-
           echo "Docker CLI 版本: $(docker --version)"
           echo "API 版本: $(docker version --format '{{.Client.APIVersion}}')"