From f36f26526c9723366c7bdeed158c3962656f4ed5 Mon Sep 17 00:00:00 2001 From: Apoorv Kothari Date: Thu, 5 Nov 2026 13:50:00 -0800 Subject: [PATCH 1/3] [build]: downgrade to bookworm. Signed-off-by: Apoorv Kothari --- Dockerfile | 2 +- k3s-images.json | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d3a744..c647c98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG GO_TAG=1.26.10 ARG RUST_TAG=1.90.0 -ARG DEBIAN_RELEASE=trixie +ARG DEBIAN_RELEASE=bookworm # These layers include Debian apt caches, so layers that extend `apt-base` # should not be published. Instead, these layers should be used to provide diff --git a/k3s-images.json b/k3s-images.json index 9684ba0..0bbf97e 100644 --- a/k3s-images.json +++ b/k3s-images.json @@ -1,23 +1,23 @@ { "name": "docker.io/rancher/k3s", "channels": { - "stable": "v1.36.5-k3s1", - "latest": "v1.37.1-k3s1", + "stable": "v1.37.2-k3s1", + "latest": "v1.37.2-k3s1", "v1.31": "v1.31.14-k3s1", "v1.32": "v1.32.13-k3s1", "v1.33": "v1.33.13-k3s2", - "v1.34": "v1.34.12-k3s1", - "v1.35": "v1.35.9-k3s1", - "v1.36": "v1.36.5-k3s1", - "v1.37": "v1.37.1-k3s1" + "v1.34": "v1.34.13-k3s1", + "v1.35": "v1.35.10-k3s1", + "v1.36": "v1.36.6-k3s1", + "v1.37": "v1.37.2-k3s1" }, "digests": { "v1.31.14-k3s1": "sha256:6c33f6a8ff6dd6ae63428d5c8e331e059a4111d5ec3f5beaa9df6c50ba6b7ce8", "v1.32.13-k3s1": "sha256:7534b63e02277917f77c584ed5532b31562c760d6bb8fe88059002e9bdeee033", "v1.33.13-k3s2": "sha256:ada5ff2e138120efe877f76d514dedda65b304122112b982eab532732c028c89", - "v1.34.12-k3s1": "sha256:4ea0adb6b0ffedab0c58ffe5c99a49f2f7be871f38636c8baa2692899648d8c5", - "v1.35.9-k3s1": "sha256:ec9868c6a38d4e8c1869832fb5fd1eb8473c39794a0b44d2b952e7ba911951bc", - "v1.36.5-k3s1": "sha256:057cfd5a9d51b89f1f0ee139c28d5d5fdd5aa7ddeac2742a0ba90c6dbc0329bb", - "v1.37.1-k3s1": "sha256:ca7f37d993d82ef0dcdcfecb2e0e2618ea541dbaffc620c8cedebe01a82acd0d" + "v1.34.13-k3s1": "sha256:fb940fd33b04fe6894e5c09ca1d976e25a5eb378e2ee49144401d660dd1d306f", + "v1.35.10-k3s1": "sha256:8262ca99a558dca0c0437443421986480b2359f9118f2371359f88a41514522f", + "v1.36.6-k3s1": "sha256:88d3fac10eb4a429d3c5275f4868fe4b13620f6bbca5bdb5dca0627ac76ae2a0", + "v1.37.2-k3s1": "sha256:21ea6e0fac4e3930c2ce8aa40ddd41a8b18cb3e9a0222c030dc005e7e88c4332" } } From 6d400bccf0d825d2c2ec370266246984fd534534 Mon Sep 17 00:00:00 2001 From: Apoorv Kothari Date: Thu, 5 Nov 2026 13:58:46 -0800 Subject: [PATCH 2/3] [build]: fix bookworm cross toolchain and just installs. Signed-off-by: Apoorv Kothari --- Dockerfile | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index c647c98..f3479a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -351,18 +351,27 @@ FROM rust as rust-musl RUN rustup target add \ aarch64-unknown-linux-musl \ x86_64-unknown-linux-musl +# Installs cross binutils and gcc for the other arch only. +# +# Bookworm ships -gcc for the native arch with the base gcc and has no +# native gcc- package, so asking for both arches fails to resolve. +# linux-libc-dev is per-arch on bookworm, so both are installed to give each +# musl target its /asm headers. RUN --mount=type=cache,from=apt-base,source=/etc/apt,target=/etc/apt,sharing=locked \ --mount=type=cache,from=apt-base,source=/var/cache/apt,target=/var/cache/apt,sharing=locked \ --mount=type=cache,from=apt-base,source=/var/lib/apt,target=/var/lib/apt,sharing=locked \ dpkg --add-architecture amd64 && \ dpkg --add-architecture arm64 && \ apt-get update && \ + case "$(dpkg --print-architecture)" in \ + amd64) cross='binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu libc6-dev-arm64-cross' ;; \ + arm64) cross='binutils-x86-64-linux-gnu gcc-x86-64-linux-gnu libc6-dev-amd64-cross' ;; \ + *) echo "unsupported build architecture" >&2 ; exit 1 ;; \ + esac && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ - binutils-aarch64-linux-gnu \ - binutils-x86-64-linux-gnu \ - gcc-aarch64-linux-gnu \ - gcc-x86-64-linux-gnu \ - libc6-dev-arm64-cross \ + $cross \ + linux-libc-dev:amd64 \ + linux-libc-dev:arm64 \ musl-dev:amd64 \ musl-dev:arm64 # Gives each musl target a directory holding only the kernel headers. @@ -411,7 +420,6 @@ RUN --mount=type=cache,from=apt-base,source=/etc/apt,target=/etc/apt,sharing=loc iproute2 \ jo \ jq \ - just \ libssl-dev \ locales \ lsb-release \ From 2871cb7085fee1d95ed29753b2d9e66c6b7a467e Mon Sep 17 00:00:00 2001 From: Apoorv Kothari Date: Thu, 5 Nov 2026 13:40:37 -0800 Subject: [PATCH 3/3] [build]: release v55. Signed-off-by: Apoorv Kothari --- .devcontainer/devcontainer.json | 2 +- actions/setup-tools/action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b6ec354..fcc5ed6 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "linkerd-dev", - "image": "ghcr.io/linkerd/dev:v54", + "image": "ghcr.io/linkerd/dev:v55", "customizations": { "vscode": { "extensions": [ diff --git a/actions/setup-tools/action.yml b/actions/setup-tools/action.yml index 74bc4d0..94063a9 100644 --- a/actions/setup-tools/action.yml +++ b/actions/setup-tools/action.yml @@ -5,7 +5,7 @@ inputs: # TODO(ver): CI should validate at this version matches the most recent release tag version: description: Container image version - default: v54 + default: v55 runs: using: composite