From b361244a04c6ba806460fb5937cd63700814c654 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 19 Dec 2025 03:53:07 +0900 Subject: [PATCH 01/11] Dockerfile: update runc to 1.3.4 Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dd808d277661..74781dffb266 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile-upstream:master -ARG RUNC_VERSION=v1.3.3 +ARG RUNC_VERSION=v1.3.4 ARG CONTAINERD_VERSION=v2.1.4 # CONTAINERD_ALT_VERSION_... defines fallback containerd version for integration tests ARG CONTAINERD_ALT_VERSION_20=v2.0.6 From e3e37f4bc95d82bc64e77a2923aaf76c75922d97 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 6 Nov 2025 12:22:36 +0900 Subject: [PATCH 02/11] dockerfile: update containerd to 2.2.1 Signed-off-by: Akihiro Suda --- Dockerfile | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 74781dffb266..6e4c680855c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ # syntax=docker/dockerfile-upstream:master ARG RUNC_VERSION=v1.3.4 -ARG CONTAINERD_VERSION=v2.1.4 +ARG CONTAINERD_VERSION=v2.2.1 # CONTAINERD_ALT_VERSION_... defines fallback containerd version for integration tests -ARG CONTAINERD_ALT_VERSION_20=v2.0.6 -ARG CONTAINERD_ALT_VERSION_17=v1.7.28 +ARG CONTAINERD_ALT_VERSION_21=v2.1.6 +ARG CONTAINERD_ALT_VERSION_17=v1.7.30 ARG REGISTRY_VERSION=v2.8.3 ARG ROOTLESSKIT_VERSION=v2.3.5 ARG CNI_VERSION=v1.8.0 @@ -231,7 +231,8 @@ RUN mkdir -p /etc/cdi /var/run/cdi /etc/buildkit/cdi FROM gobuild-base AS containerd-build WORKDIR /go/src/github.com/containerd/containerd ARG TARGETPLATFORM -ENV CGO_ENABLED=1 CGO_LDFLAGS="-fuse-ld=lld" BUILDTAGS=no_btrfs GO111MODULE=off +# nri_no_wasm: workaround for a compilation error https://github.com/moby/buildkit/pull/6340 +ENV CGO_ENABLED=1 CGO_LDFLAGS="-fuse-ld=lld" BUILDTAGS="no_btrfs nri_no_wasm" GO111MODULE=off RUN xx-apk add musl-dev gcc && xx-go --wrap COPY --chmod=755 <<-EOT /build.sh #!/bin/sh @@ -261,11 +262,11 @@ ARG CONTAINERD_VERSION ADD --keep-git-dir=true "https://github.com/containerd/containerd.git#$CONTAINERD_VERSION" . RUN /build.sh -# containerd-alt-20 builds containerd v2.0 for integration tests -FROM containerd-build AS containerd-alt-20 +# containerd-alt-21 builds containerd v2.1 for integration tests +FROM containerd-build AS containerd-alt-21 WORKDIR /go/src/github.com/containerd/containerd -ARG CONTAINERD_ALT_VERSION_20 -ADD --keep-git-dir=true "https://github.com/containerd/containerd.git#$CONTAINERD_ALT_VERSION_20" . +ARG CONTAINERD_ALT_VERSION_21 +ADD --keep-git-dir=true "https://github.com/containerd/containerd.git#$CONTAINERD_ALT_VERSION_21" . RUN /build.sh # containerd-alt-17 builds containerd v1.7 for integration tests @@ -432,7 +433,7 @@ RUN curl -fsSL https://raw.githubusercontent.com/moby/moby/v25.0.1/hack/dind > / && chmod 0755 /docker-entrypoint.sh ENTRYPOINT ["/docker-entrypoint.sh"] # musl is needed to directly use the registry binary that is built on alpine -ENV BUILDKIT_INTEGRATION_CONTAINERD_EXTRA="containerd-2.0=/opt/containerd-alt-20/bin,containerd-1.7=/opt/containerd-alt-17/bin" +ENV BUILDKIT_INTEGRATION_CONTAINERD_EXTRA="containerd-2.1=/opt/containerd-alt-21/bin,containerd-1.7=/opt/containerd-alt-17/bin" ENV BUILDKIT_INTEGRATION_SNAPSHOTTER=stargz ENV BUILDKIT_SETUP_CGROUPV2_ROOT=1 ENV BUILDKIT_TEST_SIGN_FIXTURES=/tmp/buildkit_test_sign_fixtures @@ -446,7 +447,7 @@ COPY --link --from=minio-mc /usr/bin/mc /usr/bin/ COPY --link --from=nydus /out/nydus-static/* /usr/bin/ COPY --link --from=stargz-snapshotter /out/* /usr/bin/ COPY --link --from=rootlesskit /rootlesskit /usr/bin/ -COPY --link --from=containerd-alt-20 /out/containerd* /opt/containerd-alt-20/bin/ +COPY --link --from=containerd-alt-21 /out/containerd* /opt/containerd-alt-21/bin/ COPY --link --from=containerd-alt-17 /out/containerd* /opt/containerd-alt-17/bin/ COPY --link --from=registry /out /usr/bin/ COPY --link --from=runc /usr/bin/runc /usr/bin/ From 168dc085c8702c99cd7393eb33c2d54b5d60b927 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 18 Dec 2025 11:11:17 +0900 Subject: [PATCH 03/11] Dockerfile: update RootlessKit to 2.3.6 Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6e4c680855c7..95f966790b2c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG CONTAINERD_VERSION=v2.2.1 ARG CONTAINERD_ALT_VERSION_21=v2.1.6 ARG CONTAINERD_ALT_VERSION_17=v1.7.30 ARG REGISTRY_VERSION=v2.8.3 -ARG ROOTLESSKIT_VERSION=v2.3.5 +ARG ROOTLESSKIT_VERSION=v2.3.6 ARG CNI_VERSION=v1.8.0 ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1 ARG NERDCTL_VERSION=v2.1.2 From 459f8bbcaef6b0c59f0a79df5f4a4fcef0b553ab Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 18 Dec 2025 11:11:30 +0900 Subject: [PATCH 04/11] Dockerfile: update CNI plugins to 1.9.0 Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 95f966790b2c..035ee7ad82ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG CONTAINERD_ALT_VERSION_21=v2.1.6 ARG CONTAINERD_ALT_VERSION_17=v1.7.30 ARG REGISTRY_VERSION=v2.8.3 ARG ROOTLESSKIT_VERSION=v2.3.6 -ARG CNI_VERSION=v1.8.0 +ARG CNI_VERSION=v1.9.0 ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1 ARG NERDCTL_VERSION=v2.1.2 ARG DNSNAME_VERSION=v1.3.1 From a4dde333f283919628a17192067417f8da85c259 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 18 Dec 2025 11:12:00 +0900 Subject: [PATCH 05/11] Dockerfile: update stargz-snapshotter to 0.18.1 Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 035ee7ad82ca..f3ab5b91bdff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG CONTAINERD_ALT_VERSION_17=v1.7.30 ARG REGISTRY_VERSION=v2.8.3 ARG ROOTLESSKIT_VERSION=v2.3.6 ARG CNI_VERSION=v1.9.0 -ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1 +ARG STARGZ_SNAPSHOTTER_VERSION=v0.18.1 ARG NERDCTL_VERSION=v2.1.2 ARG DNSNAME_VERSION=v1.3.1 ARG NYDUS_VERSION=v2.3.7 From a58354867a8467d1a0eab4de0e3d89c80c5032ab Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 18 Dec 2025 11:12:25 +0900 Subject: [PATCH 06/11] Dockerfile: update nerdctl to 2.2.0 Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f3ab5b91bdff..72443785d687 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ARG REGISTRY_VERSION=v2.8.3 ARG ROOTLESSKIT_VERSION=v2.3.6 ARG CNI_VERSION=v1.9.0 ARG STARGZ_SNAPSHOTTER_VERSION=v0.18.1 -ARG NERDCTL_VERSION=v2.1.2 +ARG NERDCTL_VERSION=v2.2.0 ARG DNSNAME_VERSION=v1.3.1 ARG NYDUS_VERSION=v2.3.7 ARG MINIO_VERSION=RELEASE.2025-09-07T16-13-09Z From 565d44cf66fe49206886b9ab8798daa343341552 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 18 Dec 2025 11:13:08 +0900 Subject: [PATCH 07/11] Dockerfile: update Nydus to 2.3.9 Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 72443785d687..58fdebac4d8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ARG CNI_VERSION=v1.9.0 ARG STARGZ_SNAPSHOTTER_VERSION=v0.18.1 ARG NERDCTL_VERSION=v2.2.0 ARG DNSNAME_VERSION=v1.3.1 -ARG NYDUS_VERSION=v2.3.7 +ARG NYDUS_VERSION=v2.3.9 ARG MINIO_VERSION=RELEASE.2025-09-07T16-13-09Z ARG MINIO_MC_VERSION=RELEASE.2025-08-13T08-35-41Z ARG AZURITE_VERSION=3.33.0 From 830aa7a30102f791747f9bdfdf17c96eb9d9db4d Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 18 Dec 2025 11:14:37 +0900 Subject: [PATCH 08/11] Dockerfile: update Azurite to 3.35.0 Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 58fdebac4d8e..9ff441c2094e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ARG DNSNAME_VERSION=v1.3.1 ARG NYDUS_VERSION=v2.3.9 ARG MINIO_VERSION=RELEASE.2025-09-07T16-13-09Z ARG MINIO_MC_VERSION=RELEASE.2025-08-13T08-35-41Z -ARG AZURITE_VERSION=3.33.0 +ARG AZURITE_VERSION=3.35.0 ARG GOTESTSUM_VERSION=v1.9.0 ARG DELVE_VERSION=v1.23.1 From 6bf9c050ef585ebc874b0ee08475c8c4b781462d Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 18 Dec 2025 11:14:57 +0900 Subject: [PATCH 09/11] Dockerfile: update gotestsum to 1.13.0 Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9ff441c2094e..f03d3253f92e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG NYDUS_VERSION=v2.3.9 ARG MINIO_VERSION=RELEASE.2025-09-07T16-13-09Z ARG MINIO_MC_VERSION=RELEASE.2025-08-13T08-35-41Z ARG AZURITE_VERSION=3.35.0 -ARG GOTESTSUM_VERSION=v1.9.0 +ARG GOTESTSUM_VERSION=v1.13.0 ARG DELVE_VERSION=v1.23.1 ARG EXPORT_BASE=alpine From 0fc6837151b1cf15659125fe8a59980e712f65c3 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 18 Dec 2025 11:15:14 +0900 Subject: [PATCH 10/11] Dockerfile: update Delve to 1.25.2 Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f03d3253f92e..e5a7af3c783a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG MINIO_VERSION=RELEASE.2025-09-07T16-13-09Z ARG MINIO_MC_VERSION=RELEASE.2025-08-13T08-35-41Z ARG AZURITE_VERSION=3.35.0 ARG GOTESTSUM_VERSION=v1.13.0 -ARG DELVE_VERSION=v1.23.1 +ARG DELVE_VERSION=v1.25.2 ARG EXPORT_BASE=alpine ARG ALPINE_VERSION=3.22 From 9d6f5953da6f321e9ec7ead475cbeefc5d9ccb20 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 18 Dec 2025 11:15:54 +0900 Subject: [PATCH 11/11] Dockerfile: update xx to 1.9.0 Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e5a7af3c783a..5da270ecb66f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG ALPINE_VERSION=3.22 ARG UBUNTU_VERSION=24.04 ARG GO_VERSION=1.25 -ARG XX_VERSION=1.7.0 +ARG XX_VERSION=1.9.0 ARG BUILDKIT_DEBUG # minio for s3 integration tests