From 17dbcc178d0cdc199a126d5aa7b203f7242a46be Mon Sep 17 00:00:00 2001
From: Endial Fang <endial@126.com>
Date: Mon, 12 Jan 2026 17:45:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=AD=A3=E5=A4=84=E4=BA=8E?=
 =?UTF-8?q?=E5=88=86=E6=94=AF=E6=97=B6=E7=BC=96=E8=AF=91=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=E7=9A=84tag=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build_push.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/build_push.sh b/build_push.sh
index fbb4be7..269ae52 100644
--- a/build_push.sh
+++ b/build_push.sh
@@ -87,7 +87,19 @@ build_and_push() {
         # 使用 cut 截取前8位字符
         IMAGE_TAG=$(echo "${CI_COMMIT_SHA:-}" | cut -c1-8)
     fi
-    
+
+    local IMAGE_TAG=""
+    if [ -n "${CI_COMMIT_TAG:-}" ]; then
+        # 来自 tag 推送
+        IMAGE_TAG="${CI_COMMIT_TAG}"
+    elif [ -n "${CI_COMMIT_BRANCH:-}" ] && [ "${CI_COMMIT_BRANCH}" != "main" ] && [ "${CI_COMMIT_BRANCH}" != "master" ]; then
+        # 来自非主干分支推送 → 使用分支名
+        IMAGE_TAG="${CI_COMMIT_BRANCH}"
+    else
+        # main/master 分支或无法识别 → 使用 latest
+        IMAGE_TAG="latest"
+    fi
+
     # 确定传入 Dockerfile 的 APP_VER 参数
     local APP_VER_ARG=""
     if [ "${CI_COMMIT_BRANCH:-}" = "main" ] || [ "${CI_COMMIT_BRANCH:-}" = "master" ]; then