From 05f3efc148d02acdced864b19a4222b9a0367553 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Mon, 2 Feb 2026 22:48:41 +0800 Subject: [PATCH] =?UTF-8?q?build(docker):=20=E6=9B=B4=E6=96=B0=20Docker=20?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=BA=90=E4=B8=BA=E5=8D=97=E4=BA=AC=E5=A4=A7?= =?UTF-8?q?=E5=AD=A6=E9=95=9C=E5=83=8F=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 frontend Dockerfile 中的基础镜像从 gcr.io 切换到 gcr.nju.edu.cn - 更新 offline Dockerfile 中的 nodejs20-debian12 镜像源 - 修改 export-cache.sh 脚本中的基础镜像列表为南京大学镜像 - 更新 Makefile.offline.mk 中的镜像拉取地址为本地镜像源 - 优化 export-cache.sh 脚本的格式和输出信息 - 添加缓存导出过程中的警告处理机制 --- Makefile.offline.mk | 4 ++-- scripts/images/deer-flow-frontend/Dockerfile | 2 +- scripts/offline/Dockerfile.deer-flow-frontend.offline | 2 +- scripts/offline/export-cache.sh | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.offline.mk b/Makefile.offline.mk index ecf885b..c863253 100644 --- a/Makefile.offline.mk +++ b/Makefile.offline.mk @@ -46,7 +46,7 @@ _offline-export-base-images: "ghcr.nju.edu.cn/astral-sh/uv:latest" \ "python:3.12-slim" \ "python:3.11-slim" \ - "gcr.io/distroless/nodejs20-debian12" \ + "gcr.nju.edu.cn/distroless/nodejs20-debian12" \ ); for img in "$${images[@]}"; do echo " Pulling $$img..."; docker pull "$$img" 2>/dev/null || true; done' @echo " Saving base images..." @docker save -o $(CACHE_DIR)/images/base-images.tar \ @@ -61,7 +61,7 @@ _offline-export-base-images: ghcr.nju.edu.cn/astral-sh/uv:latest \ python:3.12-slim \ python:3.11-slim \ - gcr.io/distroless/nodejs20-debian12 2>/dev/null || echo " Warning: Some images may not exist" + gcr.nju.edu.cn/distroless/nodejs20-debian12 2>/dev/null || echo " Warning: Some images may not exist" .PHONY: _offline-export-cache _offline-export-cache: diff --git a/scripts/images/deer-flow-frontend/Dockerfile b/scripts/images/deer-flow-frontend/Dockerfile index 67d4a38..74f779b 100644 --- a/scripts/images/deer-flow-frontend/Dockerfile +++ b/scripts/images/deer-flow-frontend/Dockerfile @@ -45,7 +45,7 @@ RUN npm config set registry https://registry.npmmirror.com && \ ##### RUNNER -FROM gcr.io/distroless/nodejs20-debian12 AS runner +FROM gcr.nju.edu.cn/distroless/nodejs20-debian12 AS runner WORKDIR /app ENV NODE_ENV=production diff --git a/scripts/offline/Dockerfile.deer-flow-frontend.offline b/scripts/offline/Dockerfile.deer-flow-frontend.offline index e16aad6..806d1f5 100644 --- a/scripts/offline/Dockerfile.deer-flow-frontend.offline +++ b/scripts/offline/Dockerfile.deer-flow-frontend.offline @@ -55,7 +55,7 @@ RUN npm config set registry https://registry.npmmirror.com && \ ##### RUNNER -FROM gcr.io/distroless/nodejs20-debian12 AS runner +FROM gcr.nju.edu.cn/distroless/nodejs20-debian12 AS runner WORKDIR /app ENV NODE_ENV=production diff --git a/scripts/offline/export-cache.sh b/scripts/offline/export-cache.sh index 49f6bf1..a952046 100644 --- a/scripts/offline/export-cache.sh +++ b/scripts/offline/export-cache.sh @@ -35,7 +35,7 @@ BASE_IMAGES=( "ghcr.nju.edu.cn/astral-sh/uv:latest" "python:3.12-slim" "python:3.11-slim" - "gcr.io/distroless/nodejs20-debian12" + "gcr.nju.edu.cn/distroless/nodejs20-debian12" ) for img in "${BASE_IMAGES[@]}"; do @@ -69,17 +69,17 @@ SERVICES=( for service_config in "${SERVICES[@]}"; do IFS=':' read -r service_name image_name dockerfile <<< "$service_config" cache_file="$BUILDKIT_CACHE_DIR/$service_name-cache" - + echo "" echo "导出 [$service_name] 缓存到 $cache_file..." - + # 先正常构建以填充缓存 docker buildx build \ --cache-to "type=local,dest=$cache_file,mode=max" \ -f "$dockerfile" \ -t "$image_name:cache" \ . || echo "警告: $service_name 缓存导出失败" - + echo "✓ $service_name 缓存导出完成" done