Merge pull request #899 from flatcar/containerd-1.7.2-main

Upgrade Containerd in main from 1.6.21 to 1.7.2
flatcar · Jul 6, 2023 · 7226315 · 7226315
2 parents cc94679 + 8689304
commit 7226315
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 5 deletions.
diff --git a/changelog/updates/2023-06-09-containerd-1.7.2-update.md b/changelog/updates/2023-06-09-containerd-1.7.2-update.md
@@ -0,0 +1 @@
+- containerd ([1.7.2](https://github.com/containerd/containerd/releases/tag/v1.7.2))
diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/Manifest b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/Manifest
@@ -1 +1 @@
-DIST containerd-1.6.21.tar.gz 8750934 BLAKE2B d4b0fffa628d9ec3167ebd776176d3a5884baf2f2b18add7610d8223bed4e98e5870cd4e34da7182e60c44a8fde3dfa397d3290b59384c97d276b5cb29a85b23 SHA512 a94ed8b8b9e153c9dc370228b659fcba1b03b3c47c8b5fcb001bb1b4b158ea048159f5d8d8c5294e7da3444edd76fbd903d7b7faa84e3382807a583d757325e1
+DIST containerd-1.7.2.tar.gz 9688701 BLAKE2B d31cd0e96bb2675390cc63d06114e37d532b7c666b3ffc5b0087dfcef8de23559471f08bf8a52b164c5f645faf1b8102ab2ccdd8ec417a1c74336097f0c3a899 SHA512 c0d4c02991b7e9fc341c4ef3df2d93097f5854a51b99596ed95436a79f7a586820bb8bb7c17fc43b5f38d97ea942e59490fbbf6c9710391ef9caae3d34627bc5
diff --git a/...iners/containerd/containerd-1.6.21.ebuild → ...ainers/containerd/containerd-1.7.2.ebuild b/...iners/containerd/containerd-1.6.21.ebuild → ...ainers/containerd/containerd-1.7.2.ebuild
diff --git a/...container/src/third_party/coreos-overlay/app-containers/containerd/containerd-9999.ebuild b/...container/src/third_party/coreos-overlay/app-containers/containerd/containerd-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_PV="${PV/_rc/-rc.}"
 	EGIT_COMMIT="v${MY_PV}"
-	CONTAINERD_COMMIT="66c1fbccbaaac631b77184b7957e67fea4cf45ab"
+	CONTAINERD_COMMIT="d6d1c83955ed62e2833bd470453e0449a3164e7f"
 	SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 arm64"
 	inherit vcs-snapshot

diff --git a/...ainer/src/third_party/coreos-overlay/app-containers/containerd/files/config-cgroupfs.toml b/...ainer/src/third_party/coreos-overlay/app-containers/containerd/files/config-cgroupfs.toml
@@ -18,7 +18,7 @@ uid = 0
 # socket gid
 gid = 0
 
-[plugins."containerd.runtime.v1.linux"]
+[plugins."io.containerd.runtime.v1.linux"]
 # shim binary name/path
 shim = "containerd-shim"
 # runtime binary name/path

diff --git a/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/files/config.toml b/sdk_container/src/third_party/coreos-overlay/app-containers/containerd/files/config.toml
@@ -18,7 +18,7 @@ uid = 0
 # socket gid
 gid = 0
 
-[plugins."containerd.runtime.v1.linux"]
+[plugins."io.containerd.runtime.v1.linux"]
 # shim binary name/path
 shim = "containerd-shim"
 # runtime binary name/path

diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 arm64"
 RDEPEND="
 	~app-containers/docker-20.10.24
 	~app-containers/docker-cli-20.10.24
-	~app-containers/containerd-1.6.21
+	~app-containers/containerd-1.7.2
 	~app-containers/docker-proxy-0.8.0_p20230118
 	~app-containers/runc-1.1.7
 	~dev-libs/libltdl-2.4.7