From 9145af7a089bb24d8501d84c641993595da25f9c Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 20 May 2021 14:02:08 +0900 Subject: [PATCH] update containerd (v1.5.2), runc (rc95), slirp4netns (v1.1.10) Signed-off-by: Akihiro Suda --- .github/workflows/test.yml | 4 ++-- Dockerfile | 6 +++--- Dockerfile.d/SHA256SUMS.d/containerd-1.5.1 | 4 ---- Dockerfile.d/SHA256SUMS.d/containerd-1.5.2 | 4 ++++ Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.10 | 5 +++++ Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.9 | 5 ----- go.mod | 2 +- go.sum | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 Dockerfile.d/SHA256SUMS.d/containerd-1.5.1 create mode 100644 Dockerfile.d/SHA256SUMS.d/containerd-1.5.2 create mode 100644 Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.10 delete mode 100644 Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.9 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3333b082f00..a6977978877 100644 --- a/.github/workflows/test.yml +++ b/.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: diff --git a/Dockerfile b/Dockerfile index c1ddf81aaf6..ed4f297151e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,8 @@ # Usage: `docker run -it --privileged `. 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 diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-1.5.1 b/Dockerfile.d/SHA256SUMS.d/containerd-1.5.1 deleted file mode 100644 index 19529ddff79..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/containerd-1.5.1 +++ /dev/null @@ -1,4 +0,0 @@ -# From https://github.com/kind-ci/containerd-nightlies/releases/tag/containerd-1.5.1 -1852b73687fb4ee0ab25426c909c5d38f6f123281a29e657dffbf569169c6d53 containerd-1.5.1.linux-amd64.tar.gz -a800c384a4382feb3bbe2ea14fce2672c2c11cb64e7ba2f6a0c2b84f2d24fef7 containerd-1.5.1.linux-arm64.tar.gz -16a9e9fed866ad36246239582a1d72eb2f815b6b10298a8ae493dca72af71b31 containerd.service diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-1.5.2 b/Dockerfile.d/SHA256SUMS.d/containerd-1.5.2 new file mode 100644 index 00000000000..5dcc161ab54 --- /dev/null +++ b/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 diff --git a/Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.10 b/Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.10 new file mode 100644 index 00000000000..4162a645186 --- /dev/null +++ b/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 diff --git a/Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.9 b/Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.9 deleted file mode 100644 index 1dd42965df2..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.9 +++ /dev/null @@ -1,5 +0,0 @@ -74253478ab5e18d5e2a1199f0f011454bdd3fa48112ef89c771a85c5c514e317 slirp4netns-aarch64 -9e74d2bc8f07dbc53376aeca6cb015b45c0cc89a139f95e51853f3168ae1a5ac slirp4netns-armv7l -85557a232cb78b5a4fd969f0af56424cd8bab4c9f4a594d2ed4b7e7dac0b44b5 slirp4netns-ppc64le -b707992edbd194143ca3bf7a031a1d2bc984ddbd3ca372d970e7257cd9cf31a3 slirp4netns-s390x -69c80cd0f8abc9618472958d238f15561da6a767472b11d022b86d3c33a42715 slirp4netns-x86_64 diff --git a/go.mod b/go.mod index a62ea3ad890..a1911336318 100644 --- a/go.mod +++ b/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 diff --git a/go.sum b/go.sum index 77987afcf80..ce1e14b3dc0 100644 --- a/go.sum +++ b/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=