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)