From 2c3cb4a4ef3216fee04d756d56b5a88eb3cdcb5a Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 1 Nov 2023 22:30:50 +0900 Subject: [PATCH 1/4] update containerd (1.7.8) Signed-off-by: Akihiro Suda --- .github/workflows/test.yml | 18 +++++++++--------- Dockerfile | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 74b433a175f..2a98c56dcb4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -79,9 +79,9 @@ jobs: - ubuntu: 20.04 containerd: v1.6.24 - ubuntu: 20.04 - containerd: v1.7.7 + containerd: v1.7.8 - ubuntu: 22.04 - containerd: v1.7.7 + containerd: v1.7.8 - ubuntu: 22.04 containerd: main env: @@ -113,7 +113,7 @@ jobs: # ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2 include: - ubuntu: 22.04 - containerd: v1.7.7 + containerd: v1.7.8 env: UBUNTU_VERSION: "${{ matrix.ubuntu }}" CONTAINERD_VERSION: "${{ matrix.containerd }}" @@ -160,10 +160,10 @@ jobs: containerd: v1.6.24 target: test-integration-rootless - ubuntu: 20.04 - containerd: v1.7.7 + containerd: v1.7.8 target: test-integration-rootless - ubuntu: 22.04 - containerd: v1.7.7 + containerd: v1.7.8 target: test-integration-rootless - ubuntu: 22.04 containerd: main @@ -172,10 +172,10 @@ jobs: containerd: v1.6.24 target: test-integration-rootless-port-slirp4netns - ubuntu: 20.04 - containerd: v1.7.7 + containerd: v1.7.8 target: test-integration-rootless-port-slirp4netns - ubuntu: 22.04 - containerd: v1.7.7 + containerd: v1.7.8 target: test-integration-rootless-port-slirp4netns - ubuntu: 22.04 containerd: main @@ -267,7 +267,7 @@ jobs: - uses: actions/checkout@v4.1.1 with: repository: containerd/containerd - ref: v1.7.7 + ref: v1.7.8 path: containerd fetch-depth: 1 - name: "Set up CNI" @@ -275,7 +275,7 @@ jobs: run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows - name: "Set up containerd" env: - ctrdVersion: 1.7.7 + ctrdVersion: 1.7.8 run: powershell hack/configure-windows-ci.ps1 # TODO: Run unit tests - name: "Run integration tests" diff --git a/Dockerfile b/Dockerfile index 8f382997f8a..b4fc7e0da34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ # TODO: verify commit hash # Basic deps -ARG CONTAINERD_VERSION=v1.7.7 +ARG CONTAINERD_VERSION=v1.7.8 ARG RUNC_VERSION=v1.1.9 ARG CNI_PLUGINS_VERSION=v1.3.0 From 9c1ee0665e81d9b2d22a4cee522edb8d17ad21c1 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 1 Nov 2023 22:31:53 +0900 Subject: [PATCH 2/4] update runc (1.1.10) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b4fc7e0da34..7cfa3f1b4b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ # Basic deps ARG CONTAINERD_VERSION=v1.7.8 -ARG RUNC_VERSION=v1.1.9 +ARG RUNC_VERSION=v1.1.10 ARG CNI_PLUGINS_VERSION=v1.3.0 # Extra deps: Build From 2c57b5ca0b25283ef6b0810203486d8025a3c629 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 1 Nov 2023 22:33:05 +0900 Subject: [PATCH 3/4] update BuildKit (0.12.3) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.2 | 2 -- Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.3 | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.2 create mode 100644 Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.3 diff --git a/Dockerfile b/Dockerfile index 7cfa3f1b4b5..902181c40f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG RUNC_VERSION=v1.1.10 ARG CNI_PLUGINS_VERSION=v1.3.0 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.12.2 +ARG BUILDKIT_VERSION=v0.12.3 # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1 # Extra deps: Encryption diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.2 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.2 deleted file mode 100644 index 2c9236831c1..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.2 +++ /dev/null @@ -1,2 +0,0 @@ -c856bb4e6584d75ca6b2a7b6e946b7b14628e82bf1eccb4a43bc731bbc8e67ea buildkit-v0.12.2.linux-amd64.tar.gz -78846e12435f00e0ee5b9ca0af28ec78691fa712ebe7d2c799ec8a074c791969 buildkit-v0.12.2.linux-arm64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.3 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.3 new file mode 100644 index 00000000000..3e1148e4704 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.3 @@ -0,0 +1,2 @@ +01682ab9e8e7cada519396b5f7b72c964c0c30da0c2eb7ee46caf30622717fa1 buildkit-v0.12.3.linux-amd64.tar.gz +a6809c7983834f5a4dd3a92a421a9ff9a306e774ce2866d53636e8d5a3f2e82b buildkit-v0.12.3.linux-arm64.tar.gz From 0e643d2bf80584b0048c925c35abaf44e00118b5 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 1 Nov 2023 22:34:08 +0900 Subject: [PATCH 4/4] update imgcrypt (1.1.9) Signed-off-by: Akihiro Suda --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 902181c40f6..f48d4a25501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ ARG BUILDKIT_VERSION=v0.12.3 # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1 # Extra deps: Encryption -ARG IMGCRYPT_VERSION=v1.1.8 +ARG IMGCRYPT_VERSION=v1.1.9 # Extra deps: Rootless ARG ROOTLESSKIT_VERSION=v1.1.1 ARG SLIRP4NETNS_VERSION=v1.2.2 @@ -172,6 +172,7 @@ RUN fname="stargz-snapshotter-${STARGZ_SNAPSHOTTER_VERSION}-${TARGETOS:-linux}-$ ARG IMGCRYPT_VERSION RUN git clone https://github.com/containerd/imgcrypt.git /go/src/github.com/containerd/imgcrypt && \ cd /go/src/github.com/containerd/imgcrypt && \ + git checkout "${IMGCRYPT_VERSION}" && \ CGO_ENABLED=0 make && DESTDIR=/out make install && \ echo "- imgcrypt: ${IMGCRYPT_VERSION}" >> /out/share/doc/nerdctl-full/README.md ARG ROOTLESSKIT_VERSION