From 14c239054ff23edaa5b2ac20ff8666695960a5f1 Mon Sep 17 00:00:00 2001
From: lzh <sickone075@gmail.com>
Date: Fri, 24 Apr 2026 13:55:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(ci):=20Dockerfile=20=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E5=AE=98=E6=96=B9=20maven=20=E9=95=9C=E5=83=8F=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20aliyun=20=E4=B8=8B=E6=9E=B6=203.9.14=20?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=20404?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 根因：aliyun 镜像站只保留 Maven 最新小版本，3.9.14 被下架
  之前依赖 Docker 层缓存掩盖，最近清理本地镜像后暴露
- 方案：Dockerfile.deps / Dockerfile.template 均切到
  maven:3.9-eclipse-temurin-17 官方镜像，删除自建 wget/tar/ln 逻辑
- 运行阶段仍用 eclipse-temurin:17-jre-alpine，Prod 镜像体积不变

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 docker/Dockerfile.deps     | 9 +--------
 docker/Dockerfile.template | 9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

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