diff --git a/Makefile b/Makefile index 4778f07..8b73d4a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,8 @@ MAKEFLAGS += --no-print-directory +# 启用 Docker BuildKit 以支持缓存卷等高级功能 +export DOCKER_BUILDKIT=1 + WITH_MINERU ?= false # 默认不构建mineru VERSION ?= latest NAMESPACE ?= datamate diff --git a/scripts/images/backend/Dockerfile b/scripts/images/backend/Dockerfile index 9c8a739..97ad049 100644 --- a/scripts/images/backend/Dockerfile +++ b/scripts/images/backend/Dockerfile @@ -16,10 +16,44 @@ RUN mkdir -p /root/.m2 && \ \n\ ' > /root/.m2/settings.xml +WORKDIR /opt/backend + +# 先复制所有 pom.xml 文件,利用 Docker 层缓存 +# 父 pom +COPY backend/pom.xml ./ + +# services 聚合模块 +COPY backend/services/pom.xml ./services/ + +# 共享模块 +COPY backend/shared/domain-common/pom.xml ./shared/domain-common/ +COPY backend/shared/security-common/pom.xml ./shared/security-common/ + +# 各个服务模块 +COPY backend/services/data-annotation-service/pom.xml ./services/data-annotation-service/ +COPY backend/services/data-cleaning-service/pom.xml ./services/data-cleaning-service/ +COPY backend/services/data-evaluation-service/pom.xml ./services/data-evaluation-service/ +COPY backend/services/data-management-service/pom.xml ./services/data-management-service/ +COPY backend/services/data-synthesis-service/pom.xml ./services/data-synthesis-service/ +COPY backend/services/execution-engine-service/pom.xml ./services/execution-engine-service/ +COPY backend/services/main-application/pom.xml ./services/main-application/ +COPY backend/services/operator-market-service/pom.xml ./services/operator-market-service/ +COPY backend/services/pipeline-orchestration-service/pom.xml ./services/pipeline-orchestration-service/ +COPY backend/services/rag-indexer-service/pom.xml ./services/rag-indexer-service/ +COPY backend/services/rag-query-service/pom.xml ./services/rag-query-service/ + +# 使用缓存卷下载依赖(不复制源代码时即可缓存依赖层) +RUN --mount=type=cache,target=/root/.m2/repository \ + cd /opt/backend/services && \ + mvn dependency:go-offline -Dmaven.test.skip=true || true + +# 复制所有源代码 COPY backend/ /opt/backend -RUN cd /opt/backend/services && \ - mvn -U clean package -Dmaven.test.skip=true +# 编译打包(使用缓存的依赖) +RUN --mount=type=cache,target=/root/.m2/repository \ + cd /opt/backend/services && \ + mvn -o clean package -Dmaven.test.skip=true FROM eclipse-temurin:21-jdk diff --git a/scripts/images/frontend/Dockerfile b/scripts/images/frontend/Dockerfile index f7022d3..021dadc 100644 --- a/scripts/images/frontend/Dockerfile +++ b/scripts/images/frontend/Dockerfile @@ -2,12 +2,21 @@ FROM node:20-alpine AS builder WORKDIR /app +# 配置 npm 淘宝镜像 +RUN npm config set registry https://registry.npmmirror.com + +# 先复制 package.json 和 package-lock.json,利用 Docker 层缓存 +COPY frontend/package.json frontend/package-lock.json* ./ + +# 使用缓存卷安装依赖(不复制源代码时即可缓存依赖层) +RUN --mount=type=cache,target=/root/.npm \ + if [ -f package-lock.json ]; then npm ci; else npm install; fi + +# 复制所有源代码 COPY frontend ./ -# 配置 npm 淘宝镜像 -RUN npm config set registry https://registry.npmmirror.com && \ - if [ -f package-lock.json ]; then npm ci; else npm install; fi && \ - npm run build +# 构建(使用缓存的依赖) +RUN npm run build FROM nginx:1.29 AS runner diff --git a/scripts/images/gateway/Dockerfile b/scripts/images/gateway/Dockerfile index 2e3faa1..4483d7a 100644 --- a/scripts/images/gateway/Dockerfile +++ b/scripts/images/gateway/Dockerfile @@ -16,10 +16,26 @@ RUN mkdir -p /root/.m2 && \ \n\ ' > /root/.m2/settings.xml -COPY backend/ /opt/gateway +WORKDIR /opt/gateway -RUN cd /opt/gateway/api-gateway && \ - mvn -U clean package -Dmaven.test.skip=true +# 先复制父 pom.xml(gateway 依赖父 pom 中的依赖管理) +COPY backend/pom.xml ./ + +# 复制 api-gateway 的 pom.xml +COPY backend/api-gateway/pom.xml ./api-gateway/ + +# 使用缓存卷下载依赖(不复制源代码时即可缓存依赖层) +RUN --mount=type=cache,target=/root/.m2/repository \ + cd /opt/gateway/api-gateway && \ + mvn dependency:go-offline -Dmaven.test.skip=true || true + +# 复制所有源代码 +COPY backend/api-gateway /opt/gateway/api-gateway + +# 编译打包(使用缓存的依赖) +RUN --mount=type=cache,target=/root/.m2/repository \ + cd /opt/gateway/api-gateway && \ + mvn -o clean package -Dmaven.test.skip=true FROM eclipse-temurin:21-jdk