Skip to content

Commit 6c970ab

Browse files
authored
Upgrade to Java 25 (#74)
1 parent 91ff26e commit 6c970ab

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

aarch64-cross-ubuntu/Dockerfile.bookworm-2027

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ FROM wpilib/ubuntu-${TYPE}:${UBUNTU}
55
# Install toolchain
66
RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-2/arm64-bookworm-2025-x86_64-linux-gnu-Toolchain-12.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
77

8-
RUN apt update && apt install -y openjdk-21-jdk && rm -rf /var/lib/apt/lists/*
8+
RUN apt update && apt install -y openjdk-25-jdk && rm -rf /var/lib/apt/lists/*
99

10-
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
10+
ENV JAVA_HOME=/usr/lib/jvm/java-25-openjdk-amd64
1111

1212
WORKDIR /

raspbian-cross-ubuntu/Dockerfile.bookworm-2027

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ FROM wpilib/ubuntu-${TYPE}:${UBUNTU}
66
# Install toolchain
77
RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-2/armhf-raspi-bookworm-2025-x86_64-linux-gnu-Toolchain-12.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
88

9-
RUN apt update && apt install -y openjdk-21-jdk && rm -rf /var/lib/apt/lists/*
9+
RUN apt update && apt install -y openjdk-25-jdk && rm -rf /var/lib/apt/lists/*
1010

11-
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
11+
ENV JAVA_HOME=/usr/lib/jvm/java-25-openjdk-amd64
1212

1313
WORKDIR /

systemcore-cross-ubuntu/Dockerfile.2027

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ FROM wpilib/ubuntu-${TYPE}:${UBUNTU}
55
# Install toolchain
66
RUN curl -SL https://github.com/wpilibsuite/opensdk/releases/download/v2025-2/arm64-bookworm-2025-x86_64-linux-gnu-Toolchain-12.2.0.tgz | sh -c 'mkdir -p /usr/local && cd /usr/local && tar xzf - --strip-components=2'
77

8-
RUN apt update && apt install -y openjdk-21-jdk avahi-daemon && rm -rf /var/lib/apt/lists/*
8+
RUN apt update && apt install -y openjdk-25-jdk avahi-daemon && rm -rf /var/lib/apt/lists/*
99

10-
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
10+
ENV JAVA_HOME=/usr/lib/jvm/java-25-openjdk-amd64
1111

1212
WORKDIR /

0 commit comments

Comments
 (0)