From 9537f614c7f62e96ee19cdf60800ffc48791d843 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 10:13:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9C=80=E5=90=8E=E7=9A=84?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/buid-push.yml                | 48 -------------------
 ...r-build-push.txt => docker-build-push.yml} | 24 ++++++----
 2 files changed, 15 insertions(+), 57 deletions(-)
 delete mode 100644 .gitea/workflows/buid-push.yml
 rename .gitea/workflows/{docker-build-push.txt => docker-build-push.yml} (70%)

diff --git a/.gitea/workflows/buid-push.yml b/.gitea/workflows/buid-push.yml
deleted file mode 100644
index 81afe82..0000000
--- a/.gitea/workflows/buid-push.yml
+++ /dev/null
@@ -1,48 +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
-
-      # 为后端服务生成元数据
-      - name: Extract metadata for 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}}
-
-      # 步骤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: ${{ steps.meta-backend.outputs.tags }}
-          labels: ${{ steps.meta-backend.outputs.labels }}
-  
-       
-
-          
diff --git a/.gitea/workflows/docker-build-push.txt b/.gitea/workflows/docker-build-push.yml
similarity index 70%
rename from .gitea/workflows/docker-build-push.txt
rename to .gitea/workflows/docker-build-push.yml
index b6df875..cada474 100644
--- a/.gitea/workflows/docker-build-push.txt
+++ b/.gitea/workflows/docker-build-push.yml
@@ -19,9 +19,6 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0  # 获取完整的提交历史用于标签生成
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
             
     - name: Login to Registry
       uses: docker/login-action@v3
@@ -38,8 +35,13 @@ jobs:
       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
@@ -65,8 +67,11 @@ jobs:
         context: ./backend
         file: ./backend/dockerfile
         push: true
-        tags: |
-            gitea.zfxt.top/zfxt/hehe:v1.0
+        tags: ${{ steps.meta-backend.outputs.tags }}
+        labels: ${{ steps.meta-backend.outputs.labels }}
+        cache-from: type=registry,ref=gitea.zfxt.top/zfxt/backend:latest
+        cache-to: type=registry,ref=gitea.zfxt.top/zfxt/backend:latest,mode=max
+
     # 构建和推送前端镜像
     - name: Build and push frontend image
       if: matrix.service == 'frontend'
@@ -75,6 +80,7 @@ jobs:
         context: ./front
         file: ./front/dockerfile
         push: true
-        tags: |
-            gitea.zfxt.top/zfxt/mama:v1.0
-    
\ No newline at end of file
+        tags: ${{ steps.meta-frontend.outputs.tags }}
+        labels: ${{ steps.meta-frontend.outputs.labels }}
+        cache-from: type=registry,ref=gitea.zfxt.top/zfxt/frontend:latest
+        cache-to: type=registry,ref=gitea.zfxt.top/zfxt/frontend:latest,mode=max
\ No newline at end of file