From 83f3634d06c9c1daf8c0837520279de8c1ca8af6 Mon Sep 17 00:00:00 2001
From: zhouyonggao <1971162852@qq.com>
Date: Mon, 8 Dec 2025 17:59:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor(scripts):=20=E4=BC=98=E5=8C=96dock?=
 =?UTF-8?q?er=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=9B=BA=E5=AE=9A=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?ID=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

强制构建新镜像以确保使用最新的Dockerfile配置
---
 scripts/deploy_docker.sh | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/scripts/deploy_docker.sh b/scripts/deploy_docker.sh
index f97ab11..a230e01 100755
--- a/scripts/deploy_docker.sh
+++ b/scripts/deploy_docker.sh
@@ -6,23 +6,21 @@ IMAGE="marketing-system-data-tool"
 TAG="$ENV_NAME"
 PORT="${PORT:-8077}"
 cd "$ROOT_DIR"
-FIXED_IMG_ID="254602263cd6"
-if docker image inspect "$FIXED_IMG_ID" >/dev/null 2>&1; then
-  USE_IMAGE="$FIXED_IMG_ID"
+
+# 强制构建新镜像，确保使用最新的 Dockerfile
+if docker image inspect "$IMAGE:$TAG" >/dev/null 2>&1; then
+  DOCKER_BUILDKIT=1 docker build \
+    --build-arg BUILDKIT_INLINE_CACHE=1 \
+    --build-arg GOPROXY="${GOPROXY:-https://goproxy.cn,direct}" \
+    --cache-from "$IMAGE:$TAG" -t "$IMAGE:$TAG" -f Dockerfile .
 else
-  if docker image inspect "$IMAGE:$TAG" >/dev/null 2>&1; then
-    DOCKER_BUILDKIT=1 docker build \
-      --build-arg BUILDKIT_INLINE_CACHE=1 \
-      --build-arg GOPROXY="${GOPROXY:-https://goproxy.cn,direct}" \
-      --cache-from "$IMAGE:$TAG" -t "$IMAGE:$TAG" -f Dockerfile .
-  else
-    DOCKER_BUILDKIT=1 docker build \
-      --build-arg BUILDKIT_INLINE_CACHE=1 \
-      --build-arg GOPROXY="${GOPROXY:-https://goproxy.cn,direct}" \
-      -t "$IMAGE:$TAG" -f Dockerfile .
-  fi
-  USE_IMAGE="$IMAGE:$TAG"
+  DOCKER_BUILDKIT=1 docker build \
+    --build-arg BUILDKIT_INLINE_CACHE=1 \
+    --build-arg GOPROXY="${GOPROXY:-https://goproxy.cn,direct}" \
+    -t "$IMAGE:$TAG" -f Dockerfile .
 fi
+USE_IMAGE="$IMAGE:$TAG"
+
 mkdir -p log storage/export
 CID_NAME="marketing-data-$ENV_NAME"
 RUNNING=$(docker inspect -f '{{.State.Running}}' "$CID_NAME" 2>/dev/null || echo false)

From 935d54c54cbde4eb3897c478a4b1c6fbf6427ef5 Mon Sep 17 00:00:00 2001
From: zhouyonggao <1971162852@qq.com>
Date: Mon, 8 Dec 2025 18:00:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?perf(scripts):=20=E4=BC=98=E5=8C=96docker?=
 =?UTF-8?q?=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC=E7=9A=84=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

如果镜像已存在则跳过构建，减少不必要的构建时间
---
 scripts/deploy_docker.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/deploy_docker.sh b/scripts/deploy_docker.sh
index a230e01..623922e 100755
--- a/scripts/deploy_docker.sh
+++ b/scripts/deploy_docker.sh
@@ -7,12 +7,9 @@ TAG="$ENV_NAME"
 PORT="${PORT:-8077}"
 cd "$ROOT_DIR"
 
-# 强制构建新镜像，确保使用最新的 Dockerfile
+# 如果镜像存在，则直接使用；否则构建
 if docker image inspect "$IMAGE:$TAG" >/dev/null 2>&1; then
-  DOCKER_BUILDKIT=1 docker build \
-    --build-arg BUILDKIT_INLINE_CACHE=1 \
-    --build-arg GOPROXY="${GOPROXY:-https://goproxy.cn,direct}" \
-    --cache-from "$IMAGE:$TAG" -t "$IMAGE:$TAG" -f Dockerfile .
+  echo "镜像 $IMAGE:$TAG 已存在，跳过构建。"
 else
   DOCKER_BUILDKIT=1 docker build \
     --build-arg BUILDKIT_INLINE_CACHE=1 \