From b1d64ef64b8a4b2779bdf1b0d2aa07dffcdd4bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=B4=BA?= <xiaohe@zfxt.top>
Date: Thu, 4 Sep 2025 09:40:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E5=A4=A9=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/docker-build-push.yml | 52 +++++++++++++-------------
 .gitea/workflows/docker-test.yml       | 32 ----------------
 2 files changed, 27 insertions(+), 57 deletions(-)
 delete mode 100644 .gitea/workflows/docker-test.yml

diff --git a/.gitea/workflows/docker-build-push.yml b/.gitea/workflows/docker-build-push.yml
index 695cea3..9d3d311 100644
--- a/.gitea/workflows/docker-build-push.yml
+++ b/.gitea/workflows/docker-build-push.yml
@@ -2,10 +2,10 @@ name: Build and Push Docker Images
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, develop ]
     tags: [ 'v*' ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, develop ]
 
 jobs:
   build-and-push:
@@ -17,17 +17,11 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
+      with:
+        fetch-depth: 0  # 获取完整的提交历史用于标签生成
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
-      with:
-        driver-opts: image=moby/buildkit:latest
-        install: true
-        network: host
-        buildkitd-config-inline: |
-          [registry."gitea.zfxt.top:8443"]
-            http = true
-            insecure = true
             
     - name: Login to Registry
       uses: docker/login-action@v3
@@ -36,18 +30,23 @@ jobs:
         username: ${{ secrets.REGISTRY_USERNAME }}
         password: ${{ secrets.REGISTRY_PASSWORD }}
 
-    # - name: Extract metadata for backend
-    #   if: matrix.service == 'backend'
-    #   id: meta-backend
-    #   uses: docker/metadata-action@v5
-    #   with:
-    #     images: gitea.zfxt.top/zfxt/backend
-    #     tags: |
-    #       type=ref,event=branch
-    #       type=ref,event=pr
-    #       type=semver,pattern={{version}}
-    #       type=semver,pattern={{major}}.{{minor}}
+    # 为后端服务生成元数据
+    - name: Extract metadata for backend
+      if: matrix.service == 'backend'
+      id: meta-backend
+      uses: docker/metadata-action@v5
+      with:
+        images: gitea.zfxt.top/zfxt/backend
+        tags: |
+          type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
+          type=sha,prefix=,suffix=,enable=true
+          type=ref,event=branch
+          type=ref,event=pr
+          type=semver,pattern={{version}}
+          type=semver,pattern={{major}}.{{minor}}
+          type=semver,pattern={{major}}
 
+    # 为前端服务生成元数据
     - name: Extract metadata for frontend
       if: matrix.service == 'frontend'
       id: meta-frontend
@@ -55,11 +54,15 @@ jobs:
       with:
         images: gitea.zfxt.top/zfxt/frontend
         tags: |
+          type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
+          type=sha,prefix=,suffix=,enable=true
           type=ref,event=branch
           type=ref,event=pr
           type=semver,pattern={{version}}
           type=semver,pattern={{major}}.{{minor}}
+          type=semver,pattern={{major}}
 
+    # 构建和推送后端镜像
     - name: Build and push backend image
       if: matrix.service == 'backend'
       uses: docker/build-push-action@v5
@@ -67,9 +70,8 @@ jobs:
         context: ./backend
         file: ./backend/dockerfile
         push: true
-        tags: "gitea.zfxt.top/zfxt/backend:latest"
-        labels: ${{ steps.meta-backend.outputs.labels }}
-
+        tags: ${{ steps.meta-backend.outputs.tags }}
+    # 构建和推送前端镜像
     - name: Build and push frontend image
       if: matrix.service == 'frontend'
       uses: docker/build-push-action@v5
@@ -78,4 +80,4 @@ jobs:
         file: ./front/dockerfile
         push: true
         tags: ${{ steps.meta-frontend.outputs.tags }}
-        labels: ${{ steps.meta-frontend.outputs.labels }}
\ No newline at end of file
+    
\ No newline at end of file
diff --git a/.gitea/workflows/docker-test.yml b/.gitea/workflows/docker-test.yml
deleted file mode 100644
index b12dee2..0000000
--- a/.gitea/workflows/docker-test.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Build and Push Docker Image
-
-on: [push]  # 在每次 push 时触发
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest  # 使用 Ubuntu 环境运行
-    steps:
-      # 步骤1: 检出仓库代码
-      - name: Checkout code
-        uses: actions/checkout@v4  # 使用 Gitea 官方的 checkout action
-
-      # 步骤2: 登录到 Docker Registry (你的 Gitea 仓库)
-      - name: Log in to Docker Registry
-        uses: docker/login-action@v2
-        with:
-          registry: gitea.zfxt.top
-          username: ${{ secrets.REGISTRY_USERNAME }} # 将用户名存储在仓库的 Secrets 中
-          password: ${{ secrets.REGISTRY_PASSWORD }} # 将密码或个人访问令牌存储在 Secrets 中
-
-      # 步骤3: 构建 Docker 镜像
-      - name: Build and Push Docker Image
-        uses: docker/build-push-action@v5 # 确认此插件可用
-        with:
-          context: ./backend
-          file: ./backend/dockerfile
-          push: true
-          tags: |
-            gitea.zfxt.top/zfxt/haha:v1.0
-       
-
-