Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "linkerd-dev",
"image": "ghcr.io/linkerd/dev:v54",
"image": "ghcr.io/linkerd/dev:v55",
"customizations": {
"vscode": {
"extensions": [
Expand Down
22 changes: 15 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 <triplet>-gcc for the native arch with the base gcc and has no
# native gcc-<triplet> 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 <triplet>/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.
Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion actions/setup-tools/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions k3s-images.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
Loading