Merge pull request #1650 from flatcar-linux/containerd-1.6.0-main

Upgrade Containerd in main from 1.5.9 to 1.6.0
This commit is contained in:
Dongsu Park 2022-02-17 09:12:03 +01:00 committed by GitHub
commit 5b1acafa48
5 changed files with 4 additions and 3 deletions

View File

@ -1 +1 @@
DIST containerd-1.5.9.tar.gz 7695248 BLAKE2B 1bbd755cadee9022671e6340a194c7190b7249001b56128cb6a94982d83c01dc9292e08ab591728fa223523d7488bed63d055ce0b552196cf4d1c7dfb41928b5 SHA512 13d5b8bcfd811b1abf67008d1c664962f315cd45d885adaa88847bcc4f1c5d743dccd62bc34fe77348ca18a4f8841ce7a8a022cccb275b19b59017b3fbf1054b
DIST containerd-1.6.0.tar.gz 8913791 BLAKE2B e7fd086591aa91b9e3c678ea0c7baf378d6b8c3dade96848fc42ec14e618d8f0731a74cc5817cc392377f35e4b11b117b9f291acc0b2bb79a067a200015b0a33 SHA512 4b4fd1203f9c2e381692be111d13bccb34ce5a7684b1b9111a8a6ad93f73c1de236670a020444dda60845c276fa4edae8c45d8a57c5d7696b8409f4c96e70824

View File

@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
else
MY_PV="${PV/_rc/-rc.}"
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="3bf67dd479b3beba5d4d82590593df2d9d63534f"
CONTAINERD_COMMIT="13a9d2087b04c1a99ba3fb3159fbd6b2493ca6dd"
SRC_URI="https://${GITHUB_URI}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm64"
inherit vcs-snapshot

View File

@ -13,7 +13,7 @@ KEYWORDS="amd64 arm64"
RDEPEND="
~app-emulation/docker-20.10.12
~app-emulation/docker-cli-20.10.12
~app-emulation/containerd-1.5.9
~app-emulation/containerd-1.6.0
~app-emulation/docker-proxy-0.8.0_p20210525
~app-emulation/docker-runc-1.1.0
=dev-libs/libltdl-2.4.6

View File

@ -0,0 +1 @@
- containerd ([1.6.0](https://github.com/containerd/containerd/releases/tag/v1.6.0))