add jdk25
This commit is contained in:
@@ -22,7 +22,7 @@ docker build -t gitea_runner_base ./gitea_runner_base
|
|||||||
|
|
||||||
基于 `gitea_runner_base` 的 Java 开发镜像,包含:
|
基于 `gitea_runner_base` 的 Java 开发镜像,包含:
|
||||||
|
|
||||||
- JDK 8, 21 (OpenJDK)
|
- JDK 8, 21, 25 (OpenJDK)
|
||||||
- Maven (Alpine package)
|
- Maven (Alpine package)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -35,6 +35,7 @@ docker build -t gitea_runner_java ./gitea_runner_java
|
|||||||
# 在容器内或 CI 脚本中
|
# 在容器内或 CI 脚本中
|
||||||
source use-java 8 # 切换到 JDK 8
|
source use-java 8 # 切换到 JDK 8
|
||||||
source use-java 21 # 切换到 JDK 21
|
source use-java 21 # 切换到 JDK 21
|
||||||
|
source use-java 25 # 切换到 JDK 25
|
||||||
```
|
```
|
||||||
|
|
||||||
**直接指定 JAVA_HOME:**
|
**直接指定 JAVA_HOME:**
|
||||||
|
|||||||
@@ -4,22 +4,23 @@
|
|||||||
FROM timi/gitea_runner_base:latest
|
FROM timi/gitea_runner_base:latest
|
||||||
|
|
||||||
LABEL maintainer="www.imyeyu.com"
|
LABEL maintainer="www.imyeyu.com"
|
||||||
LABEL description="Gitea Action Runner with JDK 8/21 and Maven 3"
|
LABEL description="Gitea Action Runner with JDK 8/21/25 and Maven 3"
|
||||||
|
|
||||||
# JDK 安装目录
|
# JDK 安装目录
|
||||||
ENV JAVA_BASE=/usr/lib/jvm
|
ENV JAVA_BASE=/usr/lib/jvm
|
||||||
|
|
||||||
# 安装 Alpine 仓库中的 OpenJDK 版本(仅保留 8 和 21)
|
# 安装 Alpine 仓库中的 OpenJDK 版本(仅保留 8、21 和 25)
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
openjdk8 \
|
openjdk8 \
|
||||||
openjdk21 \
|
openjdk21 \
|
||||||
|
openjdk25 \
|
||||||
maven
|
maven
|
||||||
|
|
||||||
# Maven
|
# Maven
|
||||||
ENV MAVEN_HOME=/usr/share/java/maven-3
|
ENV MAVEN_HOME=/usr/share/java/maven-3
|
||||||
|
|
||||||
# 默认使用 JDK 21
|
# 默认使用 JDK 25
|
||||||
ENV JAVA_HOME=${JAVA_BASE}/java-21-openjdk
|
ENV JAVA_HOME=${JAVA_BASE}/java-25-openjdk
|
||||||
ENV PATH="${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${PATH}"
|
ENV PATH="${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${PATH}"
|
||||||
|
|
||||||
# 创建版本切换脚本
|
# 创建版本切换脚本
|
||||||
@@ -28,7 +29,8 @@ RUN cat <<'EOF' > /usr/local/bin/use-java
|
|||||||
case "$1" in
|
case "$1" in
|
||||||
8) export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk ;;
|
8) export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk ;;
|
||||||
21) export JAVA_HOME=/usr/lib/jvm/java-21-openjdk ;;
|
21) export JAVA_HOME=/usr/lib/jvm/java-21-openjdk ;;
|
||||||
*) echo "Usage: source use-java [8|21]"; return 1 ;;
|
25) export JAVA_HOME=/usr/lib/jvm/java-25-openjdk ;;
|
||||||
|
*) echo "Usage: source use-java [8|21|25]"; return 1 ;;
|
||||||
esac
|
esac
|
||||||
export PATH="${JAVA_HOME}/bin:${PATH}"
|
export PATH="${JAVA_HOME}/bin:${PATH}"
|
||||||
echo "Switched to Java $1: $(java -version 2>&1 | head -1)"
|
echo "Switched to Java $1: $(java -version 2>&1 | head -1)"
|
||||||
@@ -39,4 +41,5 @@ RUN chmod +x /usr/local/bin/use-java
|
|||||||
RUN echo "=== Installed JDK versions ===" \
|
RUN echo "=== Installed JDK versions ===" \
|
||||||
&& echo "JDK 8: $(/usr/lib/jvm/java-1.8-openjdk/bin/java -version 2>&1 | head -1)" \
|
&& echo "JDK 8: $(/usr/lib/jvm/java-1.8-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 "JDK 21: $(/usr/lib/jvm/java-21-openjdk/bin/java -version 2>&1 | head -1)" \
|
||||||
|
&& echo "JDK 25: $(/usr/lib/jvm/java-25-openjdk/bin/java -version 2>&1 | head -1)" \
|
||||||
&& echo "Maven: $(mvn -version 2>&1 | head -1)"
|
&& echo "Maven: $(mvn -version 2>&1 | head -1)"
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ Gitea Action Runner Java 构建环境,基于 `gitea_runner_base` 添加多版
|
|||||||
|
|
||||||
| 组件 | 版本 |
|
| 组件 | 版本 |
|
||||||
|------|------|
|
|------|------|
|
||||||
| JDK | 8, 21 (OpenJDK) |
|
| JDK | 8, 21, 25 (OpenJDK) |
|
||||||
| Maven | Alpine 仓库版本 |
|
| Maven | Alpine 仓库版本 |
|
||||||
|
|
||||||
## JDK 路径
|
## JDK 路径
|
||||||
@@ -19,8 +19,9 @@ Gitea Action Runner Java 构建环境,基于 `gitea_runner_base` 添加多版
|
|||||||
|------|------|
|
|------|------|
|
||||||
| JDK 8 | `/usr/lib/jvm/java-1.8-openjdk` |
|
| JDK 8 | `/usr/lib/jvm/java-1.8-openjdk` |
|
||||||
| JDK 21 | `/usr/lib/jvm/java-21-openjdk` |
|
| JDK 21 | `/usr/lib/jvm/java-21-openjdk` |
|
||||||
|
| JDK 25 | `/usr/lib/jvm/java-25-openjdk` |
|
||||||
|
|
||||||
默认使用 JDK 21。
|
默认使用 JDK 25。
|
||||||
|
|
||||||
## 构建
|
## 构建
|
||||||
|
|
||||||
@@ -39,6 +40,7 @@ Gitea Action Runner Java 构建环境,基于 `gitea_runner_base` 添加多版
|
|||||||
```bash
|
```bash
|
||||||
source use-java 8
|
source use-java 8
|
||||||
source use-java 21
|
source use-java 21
|
||||||
|
source use-java 25
|
||||||
```
|
```
|
||||||
|
|
||||||
### 方式二:设置环境变量
|
### 方式二:设置环境变量
|
||||||
@@ -54,13 +56,14 @@ env:
|
|||||||
```bash
|
```bash
|
||||||
/usr/lib/jvm/java-1.8-openjdk/bin/java -version
|
/usr/lib/jvm/java-1.8-openjdk/bin/java -version
|
||||||
/usr/lib/jvm/java-21-openjdk/bin/java -version
|
/usr/lib/jvm/java-21-openjdk/bin/java -version
|
||||||
|
/usr/lib/jvm/java-25-openjdk/bin/java -version
|
||||||
```
|
```
|
||||||
|
|
||||||
## 环境变量
|
## 环境变量
|
||||||
|
|
||||||
| 变量 | 默认值 |
|
| 变量 | 默认值 |
|
||||||
|------|--------|
|
|------|--------|
|
||||||
| `JAVA_HOME` | `/usr/lib/jvm/java-21-openjdk` |
|
| `JAVA_HOME` | `/usr/lib/jvm/java-25-openjdk` |
|
||||||
| `MAVEN_HOME` | `/usr/share/java/maven-3` |
|
| `MAVEN_HOME` | `/usr/share/java/maven-3` |
|
||||||
|
|
||||||
## Gitea Action 示例
|
## Gitea Action 示例
|
||||||
|
|||||||
Reference in New Issue
Block a user