Merge pull request #221 from AkihiroSuda/dev2

update containerd (v1.5.2), runc (rc95), slirp4netns (v1.1.10)

.github/workflows/test.yml

@@ -42,7 +42,7 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        containerd: [1.4.5, 1.5.1]
+        containerd: [1.4.5, 1.5.2]
     env:
       CONTAINERD_VERSION: "${{ matrix.containerd }}"
     steps:
@@ -65,7 +65,7 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        containerd: [1.4.5, 1.5.1]
+        containerd: [1.4.5, 1.5.2]
     env:
       CONTAINERD_VERSION: "${{ matrix.containerd }}"
     steps:

Dockerfile

@@ -16,8 +16,8 @@
 # Usage: `docker run -it --privileged <IMAGE>`. Make sure to add `-t` and `--privileged`.
 
 # Basic deps
-ARG CONTAINERD_VERSION=1.5.1
-ARG RUNC_VERSION=1.0.0-rc94
+ARG CONTAINERD_VERSION=1.5.2
+ARG RUNC_VERSION=1.0.0-rc95
 ARG CNI_PLUGINS_VERSION=0.9.1
 
 # Extra deps: CNI isolation
@@ -30,7 +30,7 @@ ARG STARGZ_SNAPSHOTTER_VERSION=0.6.0
 ARG IMGCRYPT_VERSION=1.1.1
 # Extra deps: Rootless
 ARG ROOTLESSKIT_VERSION=0.14.2
-ARG SLIRP4NETNS_VERSION=1.1.9
+ARG SLIRP4NETNS_VERSION=1.1.10
 # Extra deps: FUSE-OverlayFS
 ARG FUSE_OVERLAYFS_VERSION=1.5.0
 ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=1.0.2

Dockerfile.d/SHA256SUMS.d/containerd-1.5.2

@@ -0,0 +1,4 @@
+# From https://github.com/kind-ci/containerd-nightlies/releases/tag/containerd-1.5.2
+1e39c79905adfde0aca9ed7347f37be9fb8b89776f4df829337eeeda983bf422  containerd-1.5.2.linux-amd64.tar.gz
+2aac475f960ee8a3a331256fd80e6ffb5f05328161e0f577d9b8691424a39584  containerd-1.5.2.linux-arm64.tar.gz
+16a9e9fed866ad36246239582a1d72eb2f815b6b10298a8ae493dca72af71b31  containerd.service

Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.10

@@ -0,0 +1,5 @@
+7049c470fa7c9ea456bf6653a7a1366dd7f1487be44c5fdef6fd7f45421e7b30  slirp4netns-aarch64
+adf83567e3b435b67ecbe72aa018e1c188f1f9ce4e7fcb3106ea1e16b6427c22  slirp4netns-armv7l
+5ec6d722b0f7c67ed6bf92f095405aeca611fc8c1ffb0784f5e6baa4988e9a65  slirp4netns-ppc64le
+9c6dfd326090af53fbcdded7df495fd47a03610508cd1cd9803f19a3f2ad62db  slirp4netns-s390x
+ea28089b15ec4e07a4d69a35e9eafcb5c8f968f9d4ac07a2f39474bf1856d215  slirp4netns-x86_64

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/compose-spec/compose-go v0.0.0-20210420125800-01e9e6b4c64c
 	github.com/containerd/cgroups v1.0.1
 	github.com/containerd/console v1.0.2
-	github.com/containerd/containerd v1.5.1
+	github.com/containerd/containerd v1.5.2
 	github.com/containerd/continuity v0.1.0
 	github.com/containerd/go-cni v1.0.3-0.20210427061315-4efee5f0b4db
 	github.com/containerd/imgcrypt v1.1.1

go.sum

@@ -139,8 +139,8 @@ github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo
 github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI=
 github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s=
 github.com/containerd/containerd v1.5.0/go.mod h1:kYiJ+LvywDUKzyax6+UKCk5xwQNCfcGR6KsSdShdg5U=
-github.com/containerd/containerd v1.5.1 h1:xWHPAoe6VkUiI9GAvndJM7s/0MTrmwX3AQiYTr3olf0=
-github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
+github.com/containerd/containerd v1.5.2 h1:MG/Bg1pbmMb61j3wHCFWPxESXHieiKr2xG64px/k8zQ=
+github.com/containerd/containerd v1.5.2/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g=
 github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=