Merge pull request #2620 from AkihiroSuda/dev

update containerd (1.7.8), runc (1.1.10), BuildKit (0.12.3), imgcrypt (1.1.9)

.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,15 +267,15 @@ jobs:
       - uses: actions/[email protected]
         with:
           repository: containerd/containerd
-          ref: v1.7.7
+          ref: v1.7.8
           path: containerd
           fetch-depth: 1
       - name: "Set up CNI"
         working-directory: containerd
         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"

Dockerfile

@@ -18,16 +18,16 @@
 # TODO: verify commit hash
 
 # Basic deps
-ARG CONTAINERD_VERSION=v1.7.7
-ARG RUNC_VERSION=v1.1.9
+ARG CONTAINERD_VERSION=v1.7.8
+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
-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

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