diff --git a/docker/Dockerfile.deps b/docker/Dockerfile.deps index a3df08e8..154e0b2a 100644 --- a/docker/Dockerfile.deps +++ b/docker/Dockerfile.deps @@ -3,14 +3,7 @@ # 预下载所有依赖,供服务构建时复用 # ============================================ -FROM eclipse-temurin:17-jdk-alpine - -# 安装 Maven(从阿里云镜像下载,避免 apk maven 包拉入冗余 JDK) -ARG MAVEN_VERSION=3.9.14 -RUN wget -q https://mirrors.aliyun.com/apache/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz -O /tmp/maven.tar.gz \ - && tar xzf /tmp/maven.tar.gz -C /opt \ - && ln -s /opt/apache-maven-${MAVEN_VERSION}/bin/mvn /usr/bin/mvn \ - && rm /tmp/maven.tar.gz +FROM maven:3.9-eclipse-temurin-17 WORKDIR /build diff --git a/docker/Dockerfile.template b/docker/Dockerfile.template index 5c09178c..ce7ded61 100644 --- a/docker/Dockerfile.template +++ b/docker/Dockerfile.template @@ -6,14 +6,7 @@ # ============================================ # ============ 构建阶段 ============ -FROM eclipse-temurin:17-jdk-alpine AS builder - -# 安装 Maven(从阿里云镜像下载,避免 apk maven 包拉入冗余 JDK) -ARG MAVEN_VERSION=3.9.14 -RUN wget -q https://mirrors.aliyun.com/apache/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz -O /tmp/maven.tar.gz \ - && tar xzf /tmp/maven.tar.gz -C /opt \ - && ln -s /opt/apache-maven-${MAVEN_VERSION}/bin/mvn /usr/bin/mvn \ - && rm /tmp/maven.tar.gz +FROM maven:3.9-eclipse-temurin-17 AS builder WORKDIR /build