Skip to content

Commit 0248a95

Browse files
chore(deps): update docker (#175)
* chore(deps): update docker Signed-off-by: bootc-bot[bot] <225049296+bootc-bot[bot]@users.noreply.github.com> * Fix qemu-kvm install issue in ubuntu:26.04 On Ubuntu 26.04, qemu-kvm is a virtual package with two competing providers (qemu-system-x86 and qemu-system-x86-hwe on amd64; qemu-system-arm and qemu-system-arm-hwe on arm64) Signed-off-by: Xiaofeng Wang <henrywangxf@me.com> --------- Signed-off-by: bootc-bot[bot] <225049296+bootc-bot[bot]@users.noreply.github.com> Signed-off-by: Xiaofeng Wang <henrywangxf@me.com> Co-authored-by: bootc-bot[bot] <225049296+bootc-bot[bot]@users.noreply.github.com> Co-authored-by: Xiaofeng Wang <henrywangxf@me.com>
1 parent 6d0a8b4 commit 0248a95

7 files changed

Lines changed: 13 additions & 7 deletions

devenv/Containerfile.c10s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN uvversion=$uvversion /run/src/install-uv.sh
3434

3535
FROM base as rust
3636
# renovate: datasource=custom.rust-nightly depName=rust-nightly versioning=rust-release-channel
37-
ARG rust_nightly=nightly-2026-04-19
37+
ARG rust_nightly=nightly-2026-04-26
3838
COPY install-rust.sh /run/src/
3939
RUN rust_nightly=$rust_nightly /run/src/install-rust.sh
4040

devenv/Containerfile.debian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN uvversion=$uvversion /run/src/install-uv.sh
3737

3838
FROM base AS rust
3939
# renovate: datasource=custom.rust-nightly depName=rust-nightly versioning=rust-release-channel
40-
ARG rust_nightly=nightly-2026-04-19
40+
ARG rust_nightly=nightly-2026-04-26
4141
COPY install-rust.sh /run/src/
4242
RUN rust_nightly=$rust_nightly /run/src/install-rust.sh
4343

devenv/Containerfile.ubuntu

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# These aren't packages, just low-dependency binaries dropped in /usr/local/bin
22
# so we can fetch them independently in a separate build.
3-
ARG base=docker.io/library/ubuntu:24.04
3+
ARG base=docker.io/library/ubuntu:26.04
44
FROM $base AS base
55
# Life is too short to care about dash
66
RUN ln -sfr /bin/bash /bin/sh
@@ -49,7 +49,7 @@ RUN uvversion=$uvversion /run/src/install-uv.sh
4949

5050
FROM base AS rust
5151
# renovate: datasource=custom.rust-nightly depName=rust-nightly versioning=rust-release-channel
52-
ARG rust_nightly=nightly-2026-04-19
52+
ARG rust_nightly=nightly-2026-04-26
5353
COPY install-rust.sh /run/src/
5454
RUN rust_nightly=$rust_nightly /run/src/install-rust.sh
5555

@@ -71,6 +71,11 @@ set -xeuo pipefail
7171
# skopeo is currently older in plucky for some reason hence --allow-downgrades
7272
/bin/time -f '%E %C' apt -y install --allow-downgrades crun/plucky podman/plucky skopeo/plucky just
7373
grep -hEve '^#' packages-common.txt packages-ubuntu.txt | /bin/time -f '%E %C' xargs apt -y install
74+
# qemu-kvm is a virtual package on Ubuntu 26.04 with multiple providers; select by arch
75+
case $(dpkg --print-architecture) in
76+
amd64) apt -y install qemu-system-x86 ;;
77+
arm64) apt -y install qemu-system-arm ;;
78+
esac
7479
grep -vEe '^#' build-deps-ubuntu.txt | /bin/time -f '%E %C' xargs apt -y build-dep
7580
apt clean && rm -rf /var/lib/apt/lists/*
7681
EORUN

devenv/packages-c10s.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ libvirt-devel
88
ostree-devel
99

1010
# Runtime virt
11+
qemu-kvm
1112
xorriso
1213
qemu-img
1314
libvirt-daemon-kvm

devenv/packages-common.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ pkg-config
2626
go-md2man
2727

2828
# Runtime virt (common packages)
29-
qemu-kvm
3029
virtiofsd
3130

3231
# TUI editors

devenv/packages-debian.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ libostree-dev
1111
python3-dev
1212

1313
# Runtime virt
14+
qemu-kvm
1415
genisoimage
1516
qemu-utils
1617
libvirt-daemon-system

devenv/tool-versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
# renovate: datasource=github-releases depName=bootc-dev/bcvk
66
bcvk@v0.14.0
77
# renovate: datasource=github-releases depName=ossf/scorecard
8-
scorecard@v5.4.0
8+
scorecard@v5.5.0
99
# renovate: datasource=github-releases depName=nushell/nushell
1010
nushell@0.112.2
1111
# renovate: datasource=github-releases depName=jj-vcs/jj
1212
jj@0.40.0
1313
# renovate: datasource=github-releases depName=nextest-rs/nextest
1414
cargo-nextest@0.9.133
1515
# renovate: datasource=github-releases depName=block/goose
16-
goose@v1.31.0
16+
goose@v1.32.0

0 commit comments

Comments
 (0)