feat(buildenvs): Bump debian and QEMU versions (#2175)

Reviewed-by: Alexander Jung <[email protected]>
Approved-by: Alexander Jung <[email protected]>

.github/workflows/buildenvs.yaml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - QEMU_VERSION: 8.2.4
+          - QEMU_VERSION: 9.2.1
 
     steps:
       - name: Get changed files

README.md

@@ -148,7 +148,7 @@ For other CI's and integrations, including GitLab, check out [the getting starte
 | Hypervisor  | Supported Version    |
 |-------------|----------------------|
 | Xen         | <= 4.19              |
-| QEMU        | <= 8.2.4 && >= 4.2.0 |
+| QEMU        | <= 9.2.1 && >= 4.2.0 |
 | Firecracker | >= 1.4.1             |
 
 |                 | QEMU | Firecracker | Xen | [containerd](/oci/README.md#supported-backends) |

buildenvs/Makefile

@@ -44,7 +44,7 @@ xen:
 		$(DOCKER_BUILD_EXTRA) $(WORKDIR)
 
 .PHONY: qemu
-qemu: QEMU_VERSION ?= 8.2.4
+qemu: QEMU_VERSION ?= 9.2.1
 qemu: MAKE_NPROC   ?= 2
 qemu: ENVIRONMENT  ?= qemu
 qemu: IMAGE        ?= $(REGISTRY)/qemu:$(QEMU_VERSION)
@@ -94,7 +94,7 @@ base: ENVIRONMENT      ?= base
 base: GO_VERSION       ?= 1.24.0
 base: IMAGE            ?= $(REGISTRY)/base:$(IMAGE_TAG)
 base: KRAFTKIT_VERSION ?= latest
-base: QEMU_VERSION     ?= 8.2.4
+base: QEMU_VERSION     ?= 9.2.1
 base: XEN_VERSION      ?= 4.19
 ifeq ($(WITH_CACHE),y)
 base: _WITH_CACHE      := --cache-from $(IMAGE)
@@ -119,7 +119,7 @@ base-golang: ENVIRONMENT      ?= base-golang
 base-golang: GO_VERSION       ?= 1.24.0
 base-golang: IMAGE            ?= $(REGISTRY)/base-golang:$(IMAGE_TAG)
 base-golang: KRAFTKIT_VERSION ?= latest
-base-golang: QEMU_VERSION     ?= 8.2.4
+base-golang: QEMU_VERSION     ?= 9.2.1
 base-golang: XEN_VERSION      ?= 4.19
 ifeq ($(WITH_CACHE),y)
 base-golang: _WITH_CACHE      := --cache-from $(IMAGE)

buildenvs/base.Dockerfile

@@ -2,14 +2,14 @@
 # Copyright (c) 2022, NEC Europe Ltd., Unikraft GmbH, and The KraftKit Authors.
 # Licensed under the BSD-3-Clause License (the "License").
 # You may not use this file except in compliance with the License.
-ARG DEBIAN_VERSION=bookworm-20241223
+ARG DEBIAN_VERSION=trixie-20250203
 ARG KRAFTKIT_VERSION=latest
-ARG QEMU_VERSION=8.2.4
+ARG QEMU_VERSION=9.2.1
 ARG REGISTRY=kraftkit.sh
 ARG XEN_VERSION=4.19
 
 FROM ${REGISTRY}/qemu:${QEMU_VERSION}       AS qemu
-FROM ${REGISTRY}/xen:${XEN_VERSION}			AS xen
+FROM ${REGISTRY}/xen:${XEN_VERSION}         AS xen
 FROM ${REGISTRY}/myself:${KRAFTKIT_VERSION} AS myself
 FROM debian:${DEBIAN_VERSION}               AS base
 
@@ -41,8 +41,8 @@ RUN set -xe; \
       libarchive-tools \
       libbtrfs-dev \
       libgpgme-dev \
-      libncursesw5 \
-      libncursesw5-dev \
+      ncurses-dev \
+      libncurses-dev \
       make \
       openssh-client \
       patch \

buildenvs/github-action.Dockerfile

@@ -3,12 +3,12 @@
 # Licensed under the BSD-3-Clause License (the "License").
 # You may not use this file except in compliance with the License.
 ARG GO_VERSION=1.24.0
-ARG DEBIAN_VERSION=bookworm-20241223
+ARG DEBIAN_VERSION=trixie-20250203
 ARG KRAFTKIT_VERSION=latest
-ARG QEMU_VERSION=8.2.4
+ARG QEMU_VERSION=9.2.1
 ARG REGISTRY=kraftkit.sh
 
-FROM golang:${GO_VERSION}-bullseye AS build
+FROM golang:${GO_VERSION}-bookworm AS build
 
 COPY . /go/src/kraftkit.sh
 
@@ -52,8 +52,8 @@ RUN set -xe; \
       gcc-12-arm-linux-gnueabihf \
       git \
       jq \
-      libncursesw5 \
-      libncursesw5-dev \
+      ncurses-dev \
+      libncurses-dev \
       make \
       openssh-client \
       patch \

buildenvs/myself.Dockerfile

@@ -3,12 +3,12 @@
 # Licensed under the BSD-3-Clause License (the "License").
 # You may not use this file except in compliance with the License.
 
-ARG GO_VERSION=1.24.0
+ARG DEBIAN_VERSION=trixie-20250203
 ARG XEN_VERSION=4.19
 ARG REGISTRY=kraftkit.sh
 
 FROM ${REGISTRY}/xen:${XEN_VERSION} AS xen
-FROM golang:${GO_VERSION}-bookworm  AS kraftkit-full
+FROM debian:${DEBIAN_VERSION}       AS kraftkit-full
 
 # Install build dependencies
 RUN set -xe; \
@@ -30,9 +30,16 @@ RUN set -xe; \
       make \
       pkg-config \
     ; \
-    apt-get clean; \
-    go install mvdan.cc/[email protected]; \
-    git config --global --add safe.directory /go/src/kraftkit.sh;
+    apt-get clean;
+
+ARG GO_VERSION=1.24.0
+
+# Install Go
+RUN set -xe; \
+    curl -Lo /tmp/go.tar.gz https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz; \
+    rm -rf /usr/local/go && tar -C /usr/local -xzf /tmp/go.tar.gz
+
+ENV PATH="${PATH}:/usr/local/go/bin"
 
 # Install YTT and Cosign
 RUN set -xe; \
@@ -75,6 +82,7 @@ COPY . .
 
 # Build the binary
 RUN set -xe; \
+    git config --global --add safe.directory /go/src/kraftkit.sh; \
     make kraft; \
     kraft -h;
 

buildenvs/qemu.Dockerfile

@@ -3,11 +3,11 @@
 # Licensed under the BSD-3-Clause License (the "License").
 # You may not use this file except in compliance with the License.
 
-ARG DEBIAN_VERSION=bookworm-20241223
+ARG DEBIAN_VERSION=trixie-20250203
 
 FROM debian:${DEBIAN_VERSION} AS qemu-build
 
-ARG QEMU_VERSION=8.2.4
+ARG QEMU_VERSION=9.2.1
 ARG WITH_XEN=disable
 ARG WITH_KVM=enable
 
@@ -40,6 +40,7 @@ RUN set -ex; \
         pkg-config \
         python3 \
         python3-pip \
+        python3-venv \
         texinfo \
         vde2 \
         xz-utils \
@@ -55,6 +56,7 @@ RUN set -ex; \
 # Configure and build QEMU
 RUN set -ex; \
     cd qemu-${QEMU_VERSION}; \
+    python3 -m venv .; \
     tlist=""; \
     if [ "${WITH_x86_64}" = "enable" ]; then \
         tlist=",x86_64-softmmu"; \
@@ -123,7 +125,6 @@ RUN set -ex; \
         --disable-linux-aio \
         --disable-linux-io-uring \
         --enable-linux-user \
-        --disable-live-block-migration \
         --disable-lzfse \
         --enable-lzo \
         --disable-malloc-trim \
@@ -143,7 +144,6 @@ RUN set -ex; \
         --disable-pixman \
         --enable-pie \
         --disable-png \
-        --disable-pvrdma \
         --disable-qcow1 \
         --disable-qed \
         --disable-qga-vss \