refactor: 移除旧的Docker工作流，整合Kaniko构建流程并优化标签生成

.gitea/workflows/docker-kaniko.yml

@@ -1,72 +0,0 @@
-name: Build with Kaniko (No Docker Required)
-
-on:
-  push:
-    branches:
-      - main
-      - master
-    tags:
-      - 'v*'
-  workflow_dispatch:
-
-env:
-  REGISTRY: code.littlelan.cn
-  IMAGE_NAME: carrotskin/backend
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    container:
-      image: gcr.io/kaniko-project/executor:debug
-      options: --entrypoint ""
-    
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Create Kaniko config
-        run: |
-          mkdir -p /kaniko/.docker
-          cat > /kaniko/.docker/config.json << EOF
-          {
-            "auths": {
-              "${{ env.REGISTRY }}": {
-                "auth": "$(echo -n '${{ secrets.REGISTRY_USERNAME }}:${{ secrets.REGISTRY_PASSWORD }}' | base64)"
-              }
-            }
-          }
-          EOF
-
-      - name: Generate destination tags
-        id: tags
-        run: |
-          SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
-          
-          # 基础标签
-          DEST="--destination=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}"
-          DEST="$DEST --destination=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:sha-$SHORT_SHA"
-          
-          # main/master 分支添加 latest 标签
-          REF="${{ github.ref }}"
-          if [ "$REF" = "refs/heads/main" ] || [ "$REF" = "refs/heads/master" ]; then
-            DEST="$DEST --destination=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
-          fi
-          
-          echo "destinations=$DEST" >> $GITHUB_OUTPUT
-
-      - name: Build and push with Kaniko
-        run: |
-          /kaniko/executor \
-            --context "${GITHUB_WORKSPACE}" \
-            --dockerfile "${GITHUB_WORKSPACE}/Dockerfile" \
-            ${{ steps.tags.outputs.destinations }} \
-            --cache=true \
-            --cache-repo=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/cache
-
-      - name: Build summary
-        run: |
-          echo "🚀 镜像构建完成"
-          echo "仓库: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"
-

.gitea/workflows/docker.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - master
+      - dev
     tags:
       - 'v*'
   workflow_dispatch:
@@ -17,16 +18,8 @@ jobs:
   build-and-push:
     runs-on: ubuntu-latest
     container:
-      image: catthehacker/ubuntu:act-latest  # 包含 Docker 和常用工具的镜像
+      image: gcr.io/kaniko-project/executor:debug
-      options: --privileged
+      options: --entrypoint ""
-    services:
-      dind:
-        image: docker:dind
-        options: --privileged
-        env:
-          DOCKER_TLS_CERTDIR: ""
-    env:
-      DOCKER_HOST: tcp://dind:2375
     
     steps:
       - name: Checkout code
@@ -34,48 +27,52 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Wait for Docker daemon
+      - name: Create registry config
         run: |
-          echo "等待 Docker 服务启动..."
+          mkdir -p /kaniko/.docker
-          for i in $(seq 1 30); do
+          AUTH=$(echo -n "${{ secrets.REGISTRY_USERNAME }}:${{ secrets.REGISTRY_PASSWORD }}" | base64 | tr -d '\n')
-            if docker info >/dev/null 2>&1; then
+          cat > /kaniko/.docker/config.json << EOF
-              echo "Docker 已就绪!"
+          {
-              docker version
+            "auths": {
-              break
+              "${{ env.REGISTRY }}": {
-            fi
+                "auth": "$AUTH"
-            echo "等待中... ($i/30)"
+              }
-            sleep 2
+            }
-          done
+          }
+          EOF
+          echo "Registry config created"
 
-      - name: Log in to Container Registry
+      - name: Build and push image
-        run: |
-          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
-
-      - name: Generate tags
-        id: tags
         run: |
+          # 获取短 SHA
           SHORT_SHA=$(echo "${{ github.sha }}" | cut -c1-7)
-          TAGS="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}"
+          REF_NAME="${{ github.ref_name }}"
-          TAGS="$TAGS,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:sha-$SHORT_SHA"
+          REF="${{ github.ref }}"
-          if [[ "${{ github.ref }}" == "refs/heads/main" || "${{ github.ref }}" == "refs/heads/master" ]]; then
+          
-            TAGS="$TAGS,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
+          # 构建目标标签
+          DESTINATIONS="--destination=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${REF_NAME}"
+          DESTINATIONS="$DESTINATIONS --destination=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:sha-${SHORT_SHA}"
+          
+          # main/master 分支添加 latest 标签
+          if [ "$REF" = "refs/heads/main" ] || [ "$REF" = "refs/heads/master" ]; then
+            DESTINATIONS="$DESTINATIONS --destination=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
           fi
-          echo "tags=$TAGS" >> $GITHUB_OUTPUT
           
-      - name: Build Docker image
+          echo "构建目标: $DESTINATIONS"
-        run: docker build -t build-image:local -f Dockerfile .
           
-      - name: Tag and push Docker image
+          # 使用 Kaniko 构建并推送
+          /kaniko/executor \
+            --context "${GITHUB_WORKSPACE}" \
+            --dockerfile "${GITHUB_WORKSPACE}/Dockerfile" \
+            $DESTINATIONS \
+            --cache=true \
+            --cache-repo=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/cache \
+            --snapshot-mode=redo \
+            --use-new-run
+
+      - name: Build complete
         run: |
-          IFS=',' read -ra TAG_ARRAY <<< "${{ steps.tags.outputs.tags }}"
+          echo "✅ 镜像构建完成!"
-          for tag in "${TAG_ARRAY[@]}"; do
+          echo "仓库: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"
-            echo "推送: $tag"
+          echo "分支: ${{ github.ref_name }}"
-            docker tag build-image:local "$tag"
+          echo "提交: ${{ github.sha }}"
-            docker push "$tag"
-          done
-
-      - name: Build summary
-        run: |
-          echo "## 🚀 Docker 镜像构建完成"
-          echo "镜像: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"
-          echo "标签: ${{ steps.tags.outputs.tags }}"