Merge remote-tracking branch 'origin/master'

.github/workflows/master.yml

@@ -1,11 +1,12 @@
-name: CI/CD Pipeline
+# 复制到 itfx 仓库: .github/workflows/deploy.yml
+# Secrets: TCR_USERNAME, TCR_PASSWORD, SSH_HOST(42), SSH_USERNAME, SSH_PASSWORD
+name: Build and Deploy
 
 on:
   push:
-    branches:
-      - master  # 监视的分支
+    branches: [master]
 
-env:                                          # ← 定义在这里
+env:
   TCR_REGISTRY: ccr.ccs.tencentyun.com
   TCR_NAMESPACE: ideship
   IMAGE_NAME: interfaceforward_api
@@ -14,11 +15,10 @@ env:                                          # ← 定义在这里
   DOCKERFILE: src/InterfaceForward.Api/Dockerfile
 
 jobs:
-  deploy:
+  build-deploy:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: docker/setup-buildx-action@v3
 
@@ -28,7 +28,7 @@ jobs:
           registry: ${{ env.TCR_REGISTRY }}
           username: ${{ secrets.TCR_USERNAME }}
           password: ${{ secrets.TCR_PASSWORD }}
-          
+
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
@@ -38,18 +38,21 @@ jobs:
           tags: |
             ${{ env.TCR_REGISTRY }}/${{ env.TCR_NAMESPACE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
             ${{ env.TCR_REGISTRY }}/${{ env.TCR_NAMESPACE }}/${{ env.IMAGE_NAME }}:latest
+          # 👇 关键：开启缓存，复用 Docker 各层
           cache-from: type=gha
           cache-to: type=gha,mode=max
+          # 👇 配置镜像加速（国内必选）
+          build-args: |
+            BUILDKIT_DOCKER_REGISTRY_MIRROR=https://mirror.ccs.tencentyun.com
 
       - name: Deploy to k3s
         uses: appleboy/ssh-action@v1.0.3
         with:
-          host: ${{ secrets.SSH_K3S_HOST }}
-          username: ${{ secrets.SSH_K3S_USERNAME }}
-          password: ${{ secrets.SSH_K3S_PASSWORD }}
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USERNAME }}
+          password: ${{ secrets.SSH_PASSWORD }}
           script: |
             export KUBECONFIG=/etc/rancher/k3s/k3s.yaml
             IMG="${{ env.TCR_REGISTRY }}/${{ env.TCR_NAMESPACE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}"
             kubectl -n prod set image deploy/${{ env.DEPLOY_NAME }} ${{ env.CONTAINER_NAME }}="$IMG"
             kubectl -n prod rollout status deploy/${{ env.DEPLOY_NAME }} --timeout=180s
-