From a28dbf29258dd001099d46e7f4be96ebb84a8f24 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 20 Jun 2024 14:54:11 +0900 Subject: [PATCH 1/9] Dockerfile: use Go 1.22 for runc Signed-off-by: Akihiro Suda --- Dockerfile | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index d0a9a16536c..5a8f8193b5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -65,18 +65,6 @@ ARG TARGETARCH RUN xx-apt-get update && \ xx-apt-get install -y binutils gcc libc6-dev libbtrfs-dev libseccomp-dev -# runc still requires Go 1.21 -# https://github.com/opencontainers/runc/issues/4233 -FROM --platform=$BUILDPLATFORM golang:1.21-bullseye AS build-base-debian-go121 -COPY --from=xx / / -ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update && \ - apt-get install -y git pkg-config dpkg-dev -ARG TARGETARCH -# libseccomp: for runc -RUN xx-apt-get update && \ - xx-apt-get install -y binutils gcc libc6-dev libseccomp-dev - FROM build-base-debian AS build-containerd ARG TARGETARCH ARG CONTAINERD_VERSION @@ -88,9 +76,7 @@ RUN git checkout ${CONTAINERD_VERSION} && \ RUN GO=xx-go make STATIC=1 && \ cp -a bin/containerd bin/containerd-shim-runc-v2 bin/ctr /out/$TARGETARCH -# runc still requires Go 1.21 -# https://github.com/opencontainers/runc/issues/4233 -FROM build-base-debian-go121 AS build-runc +FROM build-base-debian AS build-runc ARG RUNC_VERSION ARG TARGETARCH RUN git clone https://github.com/opencontainers/runc.git /go/src/github.com/opencontainers/runc From bccfdc825b1e6f340b60b9d639ce2c6e6e9307f4 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 20 Jun 2024 14:56:00 +0900 Subject: [PATCH 2/9] update containerd (2.0.0-rc.3) Signed-off-by: Akihiro Suda --- .github/workflows/test.yml | 6 +++--- Dockerfile | 2 +- hack/generate-release-note.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1258aaa0a52..b7525d62e15 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -85,7 +85,7 @@ jobs: - ubuntu: 22.04 containerd: v1.7.18 - ubuntu: 22.04 - containerd: main + containerd: main # v2.0.0-rc.X env: UBUNTU_VERSION: "${{ matrix.ubuntu }}" CONTAINERD_VERSION: "${{ matrix.containerd }}" @@ -181,7 +181,7 @@ jobs: rootlesskit: v1.1.1 target: test-integration-rootless - ubuntu: 22.04 - containerd: main + containerd: main # v2.0.0-rc.X rootlesskit: v2.1.0 target: test-integration-rootless - ubuntu: 20.04 @@ -197,7 +197,7 @@ jobs: rootlesskit: v1.1.1 target: test-integration-rootless-port-slirp4netns - ubuntu: 22.04 - containerd: main + containerd: main # v2.0.0-rc.X rootlesskit: v2.1.0 target: test-integration-rootless-port-slirp4netns env: diff --git a/Dockerfile b/Dockerfile index 5a8f8193b5e..f4ef8b0a07a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ # TODO: verify commit hash # Basic deps -ARG CONTAINERD_VERSION=v1.7.18 +ARG CONTAINERD_VERSION=v2.0.0-rc.3 ARG RUNC_VERSION=v1.1.13 ARG CNI_PLUGINS_VERSION=v1.5.0 diff --git a/hack/generate-release-note.sh b/hack/generate-release-note.sh index 877853566e5..87ce76b3f55 100755 --- a/hack/generate-release-note.sh +++ b/hack/generate-release-note.sh @@ -25,7 +25,7 @@ cat <<-EOX (To be documented) ## Compatible containerd versions -This release of nerdctl is expected to be used with containerd v1.6 or v1.7. +This release of nerdctl is expected to be used with containerd v1.6, v1.7, or v2.0. ## About the binaries - Minimal (\`${minimal_amd64tgz_basename}\`): nerdctl only From 465365a0f8375bd64670b77f60b7f2502de62710 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 20 Jun 2024 14:58:50 +0900 Subject: [PATCH 3/9] update CNI plugins (1.5.1) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.0 | 2 -- Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.1 | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.0 create mode 100644 Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.1 diff --git a/Dockerfile b/Dockerfile index f4ef8b0a07a..4d2b3fb1426 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ # Basic deps ARG CONTAINERD_VERSION=v2.0.0-rc.3 ARG RUNC_VERSION=v1.1.13 -ARG CNI_PLUGINS_VERSION=v1.5.0 +ARG CNI_PLUGINS_VERSION=v1.5.1 # Extra deps: Build ARG BUILDKIT_VERSION=v0.13.2 diff --git a/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.0 b/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.0 deleted file mode 100644 index 729e73a90fb..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.0 +++ /dev/null @@ -1,2 +0,0 @@ -57a18478422cb321370e30a5ee6ce026321289cd9c94353ca697dddd7714f1a5 cni-plugins-linux-amd64-v1.5.0.tgz -ab38507efe50c34bc2242a25c5783c19fdfe0376c65a2a91d48174d4f39f1fc2 cni-plugins-linux-arm64-v1.5.0.tgz diff --git a/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.1 b/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.1 new file mode 100644 index 00000000000..6a91ab30028 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.1 @@ -0,0 +1,2 @@ +77baa2f669980a82255ffa2f2717de823992480271ee778aa51a9c60ae89ff9b cni-plugins-linux-amd64-v1.5.1.tgz +c2a292714d0fad98a3491ae43df8ad58354b3c0bdf5d5a3e281777967c70fcff cni-plugins-linux-arm64-v1.5.1.tgz From 85a8bf86bb272a8cc5a7d5b2af20f6716c825637 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 20 Jun 2024 14:59:53 +0900 Subject: [PATCH 4/9] update BuildKit (0.14.1) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- Dockerfile.d/SHA256SUMS.d/buildkit-v0.13.2 | 2 -- Dockerfile.d/SHA256SUMS.d/buildkit-v0.14.1 | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 Dockerfile.d/SHA256SUMS.d/buildkit-v0.13.2 create mode 100644 Dockerfile.d/SHA256SUMS.d/buildkit-v0.14.1 diff --git a/Dockerfile b/Dockerfile index 4d2b3fb1426..889824fd8cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG RUNC_VERSION=v1.1.13 ARG CNI_PLUGINS_VERSION=v1.5.1 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.13.2 +ARG BUILDKIT_VERSION=v0.14.1 # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1 # Extra deps: Encryption diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.13.2 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.13.2 deleted file mode 100644 index cd252075f04..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.13.2 +++ /dev/null @@ -1,2 +0,0 @@ -9cd121931b015f05d7e4337f08272e36a83f69724c40141947eb11246ca0bb9d buildkit-v0.13.2.linux-amd64.tar.gz -bcc4cb4fec79847682fbb2ce8f612e5e854636ae6c262cee4b657d2b5c2fd46c buildkit-v0.13.2.linux-arm64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.14.1 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.14.1 new file mode 100644 index 00000000000..e059cbf6e7a --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.14.1 @@ -0,0 +1,2 @@ +836208f50ab8856a91aa5bba455b8451bbe261318cbc92e9c0ca3e786135756c buildkit-v0.14.1.linux-amd64.tar.gz +e1caad39f0bc5848a5687d7a0e8e344d20724133365596e5d881d8fbe5594b32 buildkit-v0.14.1.linux-arm64.tar.gz From f16b79c287d3813af5bd79b3aa9941cb55287225 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 20 Jun 2024 15:22:07 +0900 Subject: [PATCH 5/9] CI: cross: do not use Go 1.21 for nerdctl-full deps The latest kubo is no longer compilable with Go 1.21 Signed-off-by: Akihiro Suda --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b7525d62e15..1577cd91c99 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -237,7 +237,7 @@ jobs: cache: true check-latest: true - name: "Cross" - run: GO_VERSION="$(echo ${{ matrix.go-version }} | sed -e s/.x//)" make artifacts + run: GO_VERSION="$(echo ${{ matrix.go-version }} | sed -e s/.x//)" make binaries test-integration-docker-compatibility: runs-on: ubuntu-22.04 From 6cc63162edd98bbd48ef84a0036fce972d3979b5 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 20 Jun 2024 15:01:46 +0900 Subject: [PATCH 6/9] update Kubo (0.29.0) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 889824fd8cc..07a7d3d3ad8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ ARG BYPASS4NETNS_VERSION=v0.4.1 ARG FUSE_OVERLAYFS_VERSION=v1.13 ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.8 # Extra deps: IPFS -ARG KUBO_VERSION=v0.27.0 +ARG KUBO_VERSION=v0.29.0 # Extra deps: Init ARG TINI_VERSION=v0.19.0 # Extra deps: Debug From 480fc999d338ba269d19f19f38bde9082dff4321 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 20 Jun 2024 15:03:55 +0900 Subject: [PATCH 7/9] update gotestsum (1.12.0) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 07a7d3d3ad8..73ac059d37e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ ARG BUILDG_VERSION=v0.4.1 ARG GO_VERSION=1.22 ARG UBUNTU_VERSION=22.04 ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1 -ARG GOTESTSUM_VERSION=v1.11.0 +ARG GOTESTSUM_VERSION=v1.12.0 ARG NYDUS_VERSION=v2.2.4 ARG SOCI_SNAPSHOTTER_VERSION=0.4.0 From 820f74047d931dc8345056dc6c2fd4feaada8b0d Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 20 Jun 2024 15:04:41 +0900 Subject: [PATCH 8/9] update Nydus (2.2.5) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 73ac059d37e..22a0016a565 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ ARG GO_VERSION=1.22 ARG UBUNTU_VERSION=22.04 ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1 ARG GOTESTSUM_VERSION=v1.12.0 -ARG NYDUS_VERSION=v2.2.4 +ARG NYDUS_VERSION=v2.2.5 ARG SOCI_SNAPSHOTTER_VERSION=0.4.0 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.4.0 AS xx From c2fa1ed915b0df5bfc4daaf5e3f0d40814c1a2fd Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 20 Jun 2024 15:05:02 +0900 Subject: [PATCH 9/9] update soci-snapshotter (0.6.1) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 22a0016a565..81da164d935 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,7 @@ ARG UBUNTU_VERSION=22.04 ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1 ARG GOTESTSUM_VERSION=v1.12.0 ARG NYDUS_VERSION=v2.2.5 -ARG SOCI_SNAPSHOTTER_VERSION=0.4.0 +ARG SOCI_SNAPSHOTTER_VERSION=0.6.1 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.4.0 AS xx