Merge pull request #1145 from flatcar/containerd-1.7.6-main

Upgrade Containerd in main from 1.7.5 to 1.7.6
flatcar · Sep 15, 2023 · f38fb23 · f38fb23
2 parents 1066be4 + 95f82e9
commit f38fb23
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/changelog/updates/2023-09-15-containerd-1.7.6-update.md b/changelog/updates/2023-09-15-containerd-1.7.6-update.md
@@ -0,0 +1 @@
+- containerd ([1.7.6](https://github.com/containerd/containerd/releases/tag/v1.7.6))
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.7.5.tar.gz 9713750 BLAKE2B ffd2db6e121bdde54b86086a6de0189337b21f83c3dc5796a8afbeab228c91846d601f1cbb560f59a628339fe387681378abf272fcae7dbb542a2a7d5e8c2346 SHA512 d384363ef8bb8c47cbb84a6b549459a8db313f4ceda0757167a50bbc594715c6acc05a154dee50200e76c131fbc5c270a382e66ffe2f5bf2cfbec22f6b2f4c96
+DIST containerd-1.7.6.tar.gz 9714550 BLAKE2B 863df1a8ab0f0fe6ec62893ed64824763c1b5230fe830fa268820ce0d6254c79e1ac62ab1261a74785b86b01dff83ea9109a899857fa47a48f2cf2eaf298fea8 SHA512 8b7e13c6ea544754ba7d53092d143f3fd2224b9bc874a33d8a00b781e719927f1b22ad5cd1e35b7b95e4890e630f4b92308549a970587ccdf9dbb8eb470e2703
diff --git a/...ainers/containerd/containerd-1.7.5.ebuild → ...ainers/containerd/containerd-1.7.6.ebuild b/...ainers/containerd/containerd-1.7.5.ebuild → ...ainers/containerd/containerd-1.7.6.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="84d40840c931bd28c92dff0f70f4883b70382f01"
+	CONTAINERD_COMMIT="6563d6c06585c7f85b92eff573483bedb26f30ec"
 	SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 arm64"
 	inherit vcs-snapshot

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.7.5
+	~app-containers/containerd-1.7.6
 	~app-containers/docker-proxy-0.8.0_p20230118
 	~app-containers/runc-1.1.9
 	~dev-libs/libltdl-2.4.7