From d42880744da04220b2c6751876b21350e8ab6f64 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 9 Jun 2026 19:31:36 +0200 Subject: [PATCH] Dockerfile: containerd v2.3.2, runc v1.4.3 Signed-off-by: Sebastiaan van Stijn --- .github/workflows/.test.yml | 2 +- Dockerfile | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index 4c7aa33324ca..865088fb453e 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -114,7 +114,7 @@ jobs: - containerd - containerd-rootless - containerd-1.7 - - containerd-2.1 + - containerd-2.2 - containerd-snapshotter-stargz - oci - oci-rootless diff --git a/Dockerfile b/Dockerfile index 23d8421bcc94..237668a0a8c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ # syntax=docker/dockerfile-upstream:master -ARG RUNC_VERSION=v1.3.6 -ARG CONTAINERD_VERSION=v2.2.5 +ARG RUNC_VERSION=v1.4.3 +ARG CONTAINERD_VERSION=v2.3.2 # CONTAINERD_ALT_VERSION_... defines fallback containerd version for integration tests -ARG CONTAINERD_ALT_VERSION_21=v2.1.9 +ARG CONTAINERD_ALT_VERSION_22=v2.2.5 ARG CONTAINERD_ALT_VERSION_17=v1.7.33 ARG REGISTRY_VERSION=v2.8.3 ARG ROOTLESSKIT_VERSION=v3.0.1 @@ -278,11 +278,11 @@ ARG CONTAINERD_VERSION ADD --keep-git-dir=true "https://github.com/containerd/containerd.git#$CONTAINERD_VERSION" . RUN /build.sh -# containerd-alt-21 builds containerd v2.1 for integration tests -FROM containerd-build AS containerd-alt-21 +# containerd-alt-22 builds containerd v2.2 for integration tests +FROM containerd-build AS containerd-alt-22 WORKDIR /go/src/github.com/containerd/containerd -ARG CONTAINERD_ALT_VERSION_21 -ADD --keep-git-dir=true "https://github.com/containerd/containerd.git#$CONTAINERD_ALT_VERSION_21" . +ARG CONTAINERD_ALT_VERSION_22 +ADD --keep-git-dir=true "https://github.com/containerd/containerd.git#$CONTAINERD_ALT_VERSION_22" . RUN /build.sh # containerd-alt-17 builds containerd v1.7 for integration tests @@ -451,7 +451,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.1=/opt/containerd-alt-21/bin,containerd-1.7=/opt/containerd-alt-17/bin" +ENV BUILDKIT_INTEGRATION_CONTAINERD_EXTRA="containerd-2.2=/opt/containerd-alt-22/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 @@ -467,7 +467,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-21 /out/containerd* /opt/containerd-alt-21/bin/ +COPY --link --from=containerd-alt-22 /out/containerd* /opt/containerd-alt-22/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/