From 1339f3e62cd23f7ba8d12a4f6c8ebad7ac08aab8 Mon Sep 17 00:00:00 2001 From: Timi Date: Fri, 23 Jan 2026 17:09:08 +0800 Subject: [PATCH] remove support jdk 11,17 --- gitea_runner_java/Dockerfile | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gitea_runner_java/Dockerfile b/gitea_runner_java/Dockerfile index 27c0677..5c1ec84 100644 --- a/gitea_runner_java/Dockerfile +++ b/gitea_runner_java/Dockerfile @@ -5,16 +5,14 @@ FROM timi/gitea_runner_base:latest LABEL maintainer="www.imyeyu.com" -LABEL description="Gitea Action Runner with JDK 8/11/17/21 and Maven 3" +LABEL description="Gitea Action Runner with JDK 8/21 and Maven 3" # JDK 安装目录 ENV JAVA_BASE=/usr/lib/jvm -# 安装 Alpine 仓库中的 OpenJDK 版本 +# 安装 Alpine 仓库中的 OpenJDK 版本(仅保留 8 和 21) RUN apk add --no-cache \ openjdk8 \ - openjdk11 \ - openjdk17 \ openjdk21 # Maven 3 @@ -29,8 +27,8 @@ RUN mkdir -p ${MAVEN_HOME} \ && rm /tmp/maven.tar.gz \ && ln -s ${MAVEN_HOME}/bin/mvn /usr/local/bin/mvn -# 默认使用 JDK 17 -ENV JAVA_HOME=${JAVA_BASE}/java-17-openjdk +# 默认使用 JDK 21 +ENV JAVA_HOME=${JAVA_BASE}/java-21-openjdk ENV PATH="${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${PATH}" # 创建版本切换脚本 @@ -38,10 +36,8 @@ RUN cat <<'EOF' > /usr/local/bin/use-java #!/bin/bash case "$1" in 8) export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk ;; - 11) export JAVA_HOME=/usr/lib/jvm/java-11-openjdk ;; - 17) export JAVA_HOME=/usr/lib/jvm/java-17-openjdk ;; 21) export JAVA_HOME=/usr/lib/jvm/java-21-openjdk ;; - *) echo "Usage: source use-java [8|11|17|21]"; return 1 ;; + *) echo "Usage: source use-java [8|21]"; return 1 ;; esac export PATH="${JAVA_HOME}/bin:${PATH}" echo "Switched to Java $1: $(java -version 2>&1 | head -1)" @@ -51,7 +47,5 @@ RUN chmod +x /usr/local/bin/use-java # 验证安装 RUN echo "=== Installed JDK versions ===" \ && echo "JDK 8: $(/usr/lib/jvm/java-1.8-openjdk/bin/java -version 2>&1 | head -1)" \ - && echo "JDK 11: $(/usr/lib/jvm/java-11-openjdk/bin/java -version 2>&1 | head -1)" \ - && echo "JDK 17: $(/usr/lib/jvm/java-17-openjdk/bin/java -version 2>&1 | head -1)" \ && echo "JDK 21: $(/usr/lib/jvm/java-21-openjdk/bin/java -version 2>&1 | head -1)" \ && echo "Maven: $(mvn -version 2>&1 | head -1)"