From 038f10f561194686fa276a1f0079f7fd044dc059 Mon Sep 17 00:00:00 2001 From: Shouichi Kamiya Date: Mon, 17 Aug 2026 14:36:05 +0900 Subject: [PATCH] Fix Dockerfile to use JDK 25 Also fix .bazelrc to use JDK 25. --- .bazelrc | 16 ++++++++-------- Dockerfile | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.bazelrc b/.bazelrc index a78b185dd..3c6416443 100644 --- a/.bazelrc +++ b/.bazelrc @@ -10,15 +10,15 @@ build --jvmopt='-Dfile.encoding=UTF-8' build --test_env='LANG=en_US.UTF-8' test --test_env=PATH -build --java_language_version=21 -test --java_language_version=21 -build --tool_java_language_version=21 -test --tool_java_language_version=21 +build --java_language_version=25 +test --java_language_version=25 +build --tool_java_language_version=25 +test --tool_java_language_version=25 -build --java_runtime_version=remotejdk_21 -test --java_runtime_version=remotejdk_21 -build --tool_java_runtime_version=remotejdk_21 -test --tool_java_runtime_version=remotejdk_21 +build --java_runtime_version=remotejdk_25 +test --java_runtime_version=remotejdk_25 +build --tool_java_runtime_version=remotejdk_25 +test --tool_java_runtime_version=remotejdk_25 ################################################################################ # User bazel configuration diff --git a/Dockerfile b/Dockerfile index 9da47e15e..4ed63c308 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,10 +32,10 @@ USER ubuntu WORKDIR /home/ubuntu/ COPY . . -RUN bazel build //java/com/google/copybara:copybara_deploy.jar --java_language_version=21 --tool_java_language_version=21 --java_runtime_version=remotejdk_21 +RUN bazel build //java/com/google/copybara:copybara_deploy.jar --java_language_version=25 --tool_java_language_version=25 --java_runtime_version=remotejdk_25 --tool_java_runtime_version=remotejdk_25 # Use jammy to drop Python 2 -FROM docker.io/eclipse-temurin:21-jre-jammy +FROM docker.io/eclipse-temurin:25-jre-jammy RUN apt-get update && \ apt-get install --no-install-recommends -y git git-lfs mercurial quilt && \