From 68f65ea62b21afa6c79df0dfd77d066b615bf625 Mon Sep 17 00:00:00 2001 From: hsw Date: Sat, 27 Dec 2025 11:00:41 +0900 Subject: [PATCH 1/2] stage2: Upgrade jdk to 25 --- image/stage2/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/stage2/Dockerfile b/image/stage2/Dockerfile index c1cd831..d025c1c 100644 --- a/image/stage2/Dockerfile +++ b/image/stage2/Dockerfile @@ -123,7 +123,7 @@ RUN --mount=from=container-script,target=/tmp/container-script,readonly \ set -eux -o pipefail /tmp/container-script/dnf-wrapper.sh install --setopt=tsflags=nodocs \ - java-21-openjdk-devel \ + java-25-openjdk-devel \ ; rpm --restore --all || : From 225cbaca80531db1d44ef2921a7c27a68ad0ed58 Mon Sep 17 00:00:00 2001 From: hsw Date: Sat, 27 Dec 2025 11:03:30 +0900 Subject: [PATCH 2/2] stage2: Upgrade python to 3.13 --- image/stage2/Dockerfile | 2 +- image/stage3/Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/image/stage2/Dockerfile b/image/stage2/Dockerfile index d025c1c..1d9428d 100644 --- a/image/stage2/Dockerfile +++ b/image/stage2/Dockerfile @@ -85,7 +85,7 @@ RUN --mount=from=container-script,target=/tmp/container-script,readonly \ set -eux -o pipefail /tmp/container-script/dnf-wrapper.sh install --setopt=tsflags=nodocs \ - python3.12-devel python3.12-{pip,cffi,lxml,cryptography} \ + python3.13 python3.13-devel python3.13-pip \ ; alternatives --install /usr/bin/python3 python3 /usr/bin/python3.12 110 diff --git a/image/stage3/Dockerfile b/image/stage3/Dockerfile index a3b5c58..c0cf697 100644 --- a/image/stage3/Dockerfile +++ b/image/stage3/Dockerfile @@ -212,7 +212,7 @@ set -eux -o pipefail export SOURCE_DATE_EPOCH=0 npm install --cache /var/cache/npm --global 'corepack@0.34.0' && rm -rf /root/.npm -python3 -m pip --disable-pip-version-check --cache-dir /var/cache/pip install \ +python3.13 -m pip --disable-pip-version-check --cache-dir /var/cache/pip install \ meson==1.9.1 \ ninja==1.13.0 \ ; @@ -232,8 +232,8 @@ cd /usr/local/bin ln -s ../"cmake-${cmake_version_major}"/bin/* ./ -runuser -u nobody -- python3 --version -runuser -u nobody -- python3 -m pip --version +runuser -u nobody -- python3.13 --version +runuser -u nobody -- python3.13 -m pip --version runuser -u nobody -- java -version #runuser -u nobody -- bazelisk --version # Skipped: downloads latest bazel