Skip to content

Update #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hsw0 merged 2 commits into from
Dec 27, 2025
Merged

Update #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68f65ea
stage2: Upgrade jdk to 25
hsw0 Dec 27, 2025
225cbac
stage2: Upgrade python to 3.13
hsw0 Dec 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions image/stage2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 || :
Expand Down
6 changes: 3 additions & 3 deletions image/stage3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
;
Expand All @@ -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
Expand Down