From 5cfc2263b709cb879e786c4cd3e635e32e1f26db Mon Sep 17 00:00:00 2001
From: Endial Fang <endial@126.com>
Date: Mon, 12 Jan 2026 12:13:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC,=E5=9C=A8=E4=B8=BB=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=97=B6,=E6=8E=A8=E9=80=81latest=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build_push.sh | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/build_push.sh b/build_push.sh
index 7ef61dc..fbb4be7 100644
--- a/build_push.sh
+++ b/build_push.sh
@@ -127,8 +127,8 @@ build_and_push() {
         # 生成版本标签 (包括主版本、次版本等)
         TAGS=$(generate_version_tags "$IMAGE_TAG" "$SWR_REGISTRY_REPO")
         
-        # 如果是 main 分支，添加 latest 标签
-        if [ "${CI_COMMIT_BRANCH:-}" = "main" ]; then
+        # 如果是 main 或 master 分支，添加 latest 标签
+        if [ "${CI_COMMIT_BRANCH:-}" = "main" ] || [ "${CI_COMMIT_BRANCH:-}" = "master" ]; then
             TAGS="$TAGS,$SWR_REGISTRY_REPO:latest"
         fi
         
@@ -150,15 +150,23 @@ build_and_push() {
             exit 1
         fi
     else
-        # 非标签版本，只构建单个标签
+        # 非标签版本，构建基本标签
+        local build_args="-t $SWR_REGISTRY_REPO:$IMAGE_TAG"
+        track_image "$SWR_REGISTRY_REPO:$IMAGE_TAG"
+        
+        # 如果是 main 或 master 分支，也推送 latest 标签
+        if [ "${CI_COMMIT_BRANCH:-}" = "main" ] || [ "${CI_COMMIT_BRANCH:-}" = "master" ]; then
+            build_args="$build_args -t $SWR_REGISTRY_REPO:latest"
+            track_image "$SWR_REGISTRY_REPO:latest"
+        fi
+        
         echo ""
-        echo "Build and push image: $SWR_REGISTRY_REPO:$IMAGE_TAG"
-        docker buildx build --platform linux/amd64,linux/arm64 -t "$SWR_REGISTRY_REPO:$IMAGE_TAG" $APP_VER_ARG --push --provenance=false --sbom=false .
+        echo "Build and push image: $SWR_REGISTRY_REPO:$IMAGE_TAG and possibly latest"
+        docker buildx build --platform linux/amd64,linux/arm64 $APP_VER_ARG $build_args --push --provenance=false --sbom=false .
         if [ $? -ne 0 ]; then
             echo "错误: 镜像构建或推送失败"
             exit 1
         fi
-        track_image "$SWR_REGISTRY_REPO:$IMAGE_TAG"
     fi
     
     echo "Image pushed: $SWR_REGISTRY_REPO:$IMAGE_TAG"