From 4ae7ed783f86e695474dca289bc3f6cb6ecbb3f4 Mon Sep 17 00:00:00 2001
From: shanshanzhong <shanshanzhong147@gmail.com>
Date: Thu, 13 Nov 2025 19:14:39 -0800
Subject: [PATCH] =?UTF-8?q?ci(docker):=20=E6=9B=B4=E6=96=B0Docker=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=92=8C=E5=AE=89=E8=A3=85=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除apps中package.json的version字段
- 添加DOCKER_API_VERSION环境变量
- 改进Docker安装流程，使用官方源安装新版CLI和Buildx插件
---
 .gitea/workflows/docker.yml | 11 ++++++++++-
 apps/admin/package.json     |  1 -
 apps/user/package.json      |  1 -
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml
index 40fd66e..a034b10 100644
--- a/.gitea/workflows/docker.yml
+++ b/.gitea/workflows/docker.yml
@@ -19,6 +19,7 @@ env:
   TELEGRAM_CHAT_ID: "-4940243803"
   DOCKER_REGISTRY: registry.kxsw.us
   DOCKER_BUILDKIT: 1
+  DOCKER_API_VERSION: "1.44"
   # Host SSH - 根据分支动态选择
   SSH_HOST: ${{ github.ref_name == 'main' && vars.PRO_SSH_HOST || (github.ref_name == 'dev' && vars.DEV_SSH_HOST || vars.PRO_SSH_HOST) }}
   SSH_PORT: ${{ github.ref_name == 'main' && vars.PRO_SSH_PORT || (github.ref_name == 'dev' && vars.DEV_SSH_PORT || vars.PRO_SSH_PORT) }}
@@ -97,7 +98,15 @@ jobs:
             echo "Still waiting for locks..."; sleep 5
           done
           apt-get update -y -o Dpkg::Lock::Timeout=600
-          apt-get install -y -o Dpkg::Lock::Timeout=600 jq curl ca-certificates docker.io
+          # 基础工具和GPG
+          apt-get install -y -o Dpkg::Lock::Timeout=600 jq curl ca-certificates gnupg
+          # 配置Docker官方源，安装新版CLI与Buildx插件（支持 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
+          chmod a+r /etc/apt/keyrings/docker.gpg
+          echo "deb [arch=$(dpkg --print-architecture) 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=600
+          apt-get install -y -o Dpkg::Lock::Timeout=600 docker-ce-cli docker-buildx-plugin
           docker --version
           jq --version
           curl --version
diff --git a/apps/admin/package.json b/apps/admin/package.json
index 16c3bd5..8345a93 100644
--- a/apps/admin/package.json
+++ b/apps/admin/package.json
@@ -1,6 +1,5 @@
 {
   "name": "ppanel-admin-web",
-  "version": "1.3.1",
   "private": true,
   "scripts": {
     "build": "next build",
diff --git a/apps/user/package.json b/apps/user/package.json
index c07d013..3fff0ea 100644
--- a/apps/user/package.json
+++ b/apps/user/package.json
@@ -1,6 +1,5 @@
 {
   "name": "ppanel-user-web",
-  "version": "1.3.1",
   "private": true,
   "scripts": {
     "build": "next build",