From 4b8e1dbec675207822df882f83e19ad505d15491 Mon Sep 17 00:00:00 2001
From: aszerW <aszer27937@gmail.com>
Date: Thu, 26 Mar 2026 21:23:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(build):=20=E4=BF=AE=E5=A4=8D=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E9=95=9C=E5=83=8F=E5=AD=98=E5=9C=A8=E6=80=A7=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E5=8F=8A=E6=9E=84=E5=BB=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 使用docker images --format精确匹配镜像名称和标签
- 修正基础镜像检查条件，确保检测index-base:latest
- 添加未找到Dockerfile_base时的脚本退出逻辑
- 优化基础镜像构建流程提示信息
---
 build-and-push.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build-and-push.sh b/build-and-push.sh
index 0e770e9..579a2df 100755
--- a/build-and-push.sh
+++ b/build-and-push.sh
@@ -19,13 +19,14 @@ echo ""
 
 # 检查并构建基础镜像（如果不存在）
 echo "0. 检查基础镜像..."
-if ! docker images | grep -q "index-base"; then
+if ! docker images --format "{{.Repository}}:{{.Tag}}" | grep -q "index-base:latest"; then
     echo "   基础镜像不存在，开始构建..."
     if [ -f "Dockerfile_base" ]; then
         docker build --platform linux/arm64 -f Dockerfile_base -t index-base:latest .
         echo "   ✅ 基础镜像构建成功"
     else
         echo "   ⚠️ 未找到 Dockerfile_base，跳过基础镜像构建"
+        exit 1
     fi
 else
     echo "   ✅ 基础镜像已存在"