Merge branch 'dev' into debug

Author: BppleMan

.github/workflows/build-debug.yml

@@ -8,16 +8,18 @@ on:
 
 permissions:
   contents: read
-  packages: write
+  packages: read
 
 env:
-  REGISTRY: ghcr.io
+  REGISTRY: harbor.internal.bppleman.cn:30443
+  REGISTRY_USERNAME: robot$harbor-bppleman
+  REGISTRY_SECRET: ${{ secrets.HARBOR_SECRET }}
   HTTP_PROXY: http://127.0.0.1:6152
   HTTPS_PROXY: http://127.0.0.1:6152
 
 jobs:
   build-and-push:
-    name: 构建多平台镜像并推送到 GHCR
+    name: 构建多平台镜像并推送到 Harbor
     runs-on: [self-hosted, macOS, ARM64]
 
     steps:
@@ -28,42 +30,51 @@ jobs:
       - name: 构建 builder 工具
         run: cargo install --path crates/builder
 
+      - name: 初始化 fnm 环境
+        run: |
+          eval "$(fnm env --shell bash)"
+          fnm use 24
+          echo "$(dirname $(which node))" >> "$GITHUB_PATH"
+
       - name: 安装 Dashboard 依赖
         run: pnpm install
         working-directory: dashboard
 
-      - name: 登录到 GHCR
+      - name: 登录到 Harbor
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ env.REGISTRY_USERNAME }}
+          password: ${{ env.REGISTRY_SECRET }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
           driver-opts: network=host
           config-inline: |
-            [registry."ghcr.io"]
-              [registry."ghcr.io".auth]
-                username = "${{ github.repository_owner }}"
-                password = "${{ secrets.GITHUB_TOKEN }}"
+            [registry."${{ env.REGISTRY }}"]
+              [registry."${{ env.REGISTRY }}".auth]
+                username = "${{ env.REGISTRY_USERNAME }}"
+                password = "${{ env.REGISTRY_SECRET }}"
 
       - name: 检查基础镜像可访问性，不存在则构建并推送
         run: |
           set -e
-          BASE_IMAGE=$(builder tag base debug --registry ghcr --user ${{ github.repository_owner }})
+          BASE_IMAGE=$( \
+            builder tag base debug \
+            --registry ${{ env.REGISTRY }} \
+            --user ${{ github.repository_owner }}
+          )
           echo "🔍 检查基础镜像: $BASE_IMAGE"
 
           if docker buildx imagetools inspect "$BASE_IMAGE" > /dev/null 2>&1; then
             echo "✅ 基础镜像已存在，跳过构建"
           else
             echo "⚠️ 基础镜像不存在，开始构建并推送..."
-            builder image base \
-              debug \
+            builder image base debug \
               --arch amd,arm \
-              --user ${{ github.repository_owner }} \
-              --registry ghcr
+              --registry ${{ env.REGISTRY }} \
+              --user ${{ github.repository_owner }}
             echo "✅ 基础镜像构建并推送完成"
           fi
 
@@ -77,5 +88,5 @@ jobs:
             debug \
             --arch amd,arm \
             --dashboard \
-            --user ${{ github.repository_owner }} \
-            --registry ghcr
+            --registry ${{ env.REGISTRY }} \
+            --user ${{ github.repository_owner }}

Cargo.toml

@@ -14,7 +14,7 @@ authors = ["BppleMan"]
 version = "2.6.15"
 edition = "2024"
 license = "Apache-2.0"
-repository = "https://github.com/BppleMan/convertor"
+repository = "https://github.com/convertor-gitops/convertor"
 
 [workspace.dependencies]
 # 本地/工作区包

crates/builder/src/commands/image.rs

@@ -103,6 +103,7 @@ impl ImageCommand {
         command
     }
 
+    #[allow(unused)]
     fn cleanup_remote_tag(&self, tag: &Tag, arch: Arch) -> Command {
         let mut command = Command::new("docker");
         command.arg("rmi").arg(tag.remote(&self.registry, Some(arch), None));
@@ -148,7 +149,6 @@ impl Commander for ImageCommand {
         for arch in self.arch.iter().copied() {
             commands.push(self.remote_tag_image(&tag, arch));
             commands.push(self.push_image(&tag, arch));
-            commands.push(self.cleanup_remote_tag(&tag, arch));
         }
         // 最后创建多架构清单并推送，需要包含version标签和latest标签
         commands.push(self.manifest_image(&tag, &self.version));