80 Commits

Author SHA1 Message Date
openeuler-ci-bot
6d0cf15ebf
!211 [sync] PR-208: fix CVE-2024-40635
From: @openeuler-sync-bot 
Reviewed-by: @xuxuepeng 
Signed-off-by: @xuxuepeng
2025-03-19 08:54:46 +00:00
dongyuzhen
5f7c845ab8 fix CVE-2024-40635
(cherry picked from commit bc25a45e9ebfef0057bc924c910a6ee53b250025)
2025-03-19 16:19:16 +08:00
openeuler-ci-bot
b2b036e9bc
!201 containerd:bump release version
From: @zhong-jiawei-1 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
2024-11-14 01:14:57 +00:00
zhongjiawei
d785e204fe containerd:bump release version 2024-11-13 18:18:54 +08:00
openeuler-ci-bot
015df96b73
!199 fix build error on loongarch64
From: @zhangwenlong01 
Reviewed-by: @yangzhao_kl 
Signed-off-by: @yangzhao_kl
2024-10-16 01:58:33 +00:00
Wenlong Zhang
630dea1fe6 fix build error on loongarch64 2024-10-15 20:54:22 +08:00
openeuler-ci-bot
a7afba863d
!197 [sync] PR-196: containerd:enable cri
From: @openeuler-sync-bot 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
2024-10-08 06:47:45 +00:00
zhongjiawei
33cc12d096 containerd:enable cri
(cherry picked from commit bebf565d655f8c01038a03eddf38b62e8115a81f)
2024-10-08 14:33:08 +08:00
openeuler-ci-bot
6b5cbb9529
!183 [sync] PR-177: fix clang compile error due to "unknown flag -znow"
From: @tiberium 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
2024-04-07 01:27:45 +00:00
tiberium
d9e8e5d8bf fix clang compile error due to flag format error 2024-03-22 19:19:07 +08:00
openeuler-ci-bot
36ee416f82
!179 [sync] PR-178: containerd:remove stw gc sweep set for arm64
From: @openeuler-sync-bot 
Reviewed-by: @flyflyflypeng 
Signed-off-by: @flyflyflypeng
2024-03-22 07:56:41 +00:00
zhongjiawei
f28e1587cb containerd:remove stw gc sweep set for arm64
(cherry picked from commit bacfecc5bbd6afe47dad193794ef69d11c45333f)
2024-03-22 14:43:11 +08:00
openeuler-ci-bot
ee86ab3f00
!172 将riscv64加入0034号补丁
From: @laokz 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
2024-03-16 07:29:55 +00:00
laokz
4f8d5aa72b add riscv64 to THP patch 2024-03-15 14:55:46 +08:00
openeuler-ci-bot
1d926c4404
!171 add Requires runc
From: @duyiwei7w 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
2024-03-15 03:28:21 +00:00
duyiwei
3f5ff5ab90
add Requires runc
Signed-off-by: duyiwei <duyiwei@kylinos.cn>
2024-03-11 08:53:47 +00:00
openeuler-ci-bot
bbd3419ce1
!156 containerd:disable Transparent HugePage for shim process if SHIM_DISABLE_THP is set
From: @zhong-jiawei-1 
Reviewed-by: @flyflyflypeng 
Signed-off-by: @flyflyflypeng
2024-02-23 07:23:39 +00:00
zhongjiawei
7f3cac2599 containerd:disable Transparent HugePage for shim process if SHIM_DISABLE_THP is set 2024-02-23 15:00:46 +08:00
openeuler-ci-bot
bcf18b7a7a
!129 containerd:fix mission closed fifo
From: @zhong-jiawei-1 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
2023-12-21 08:48:33 +00:00
zhongjiawei
31cc3dd36c containerd:fix mission closed fifo 2023-12-21 14:54:46 +08:00
openeuler-ci-bot
fc44bce51f
!119 containerd:update vendor net/http package to fix CVE-2023-39325
From: @zhong-jiawei-1 
Reviewed-by: @zhangsong234, @duguhaotian 
Signed-off-by: @zhangsong234, @duguhaotian
2023-11-08 06:37:18 +00:00
zhongjiawei
a90d673203 containerd:update vendor net/http package to fix CVE-2023-39325 2023-11-08 10:47:20 +08:00
openeuler-ci-bot
dbc8a45bdd
!117 Fix the abnormal logic of starting the container time out.
From: @xu_lei_123 
Reviewed-by: @zhong-jiawei-1, @zhangsong234, @duguhaotian 
Signed-off-by: @duguhaotian
2023-10-25 06:33:52 +00:00
xulei
8d9abebd65
Fix the abnormal logic of starting the container time out.
Signed-off-by: xulei <xulei@xfusion.com>
2023-10-25 03:42:17 +00:00
openeuler-ci-bot
fe9fd18f43
!115 containerd:fix some bugs after version upgrade
From: @zhong-jiawei-1 
Reviewed-by: @duguhaotian, @zhangsong234 
Signed-off-by: @duguhaotian
2023-10-19 07:05:52 +00:00
zhongjiawei
8aba0d5156 containerd:fix some bugs after version upgrade 2023-10-19 10:19:33 +08:00
openeuler-ci-bot
1bc1295219
!107 containerd:sync some patches
From: @zhong-jiawei-1 
Reviewed-by: @zhangsong234, @duguhaotian 
Signed-off-by: @duguhaotian
2023-09-19 08:29:44 +00:00
zhongjiawei
bf91571d1f containerd:symc some patches 2023-09-19 14:43:01 +08:00
openeuler-ci-bot
3ca6b8d5d1
!105 containerd:add patch for 1.6.22
From: @zhong-jiawei-1 
Reviewed-by: @zhangsong234, @duguhaotian 
Signed-off-by: @duguhaotian
2023-09-08 10:43:09 +00:00
zhongjiawei
4a1d8da417 containerd:add patch for 1.6.22
Signed-off-by: zhongjiawei <zhongjiawei1@huawei.com>
2023-09-08 15:52:11 +08:00
openeuler-ci-bot
8916600448
!98 upgrade to contained 1.6.22
From: @vegbir 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian
2023-08-02 09:17:24 +00:00
vegbir
982bc6258b upgrade to contained 1.6.22
Signed-off-by: vegbir <yangjiaqi16@huawei.com>
2023-08-02 08:23:32 +00:00
openeuler-ci-bot
d1ce0b4acf
!97 upgrade to contained 1.6.21
From: @vegbir 
Reviewed-by: @zhong-jiawei-1, @duguhaotian 
Signed-off-by: @duguhaotian
2023-07-21 08:12:56 +00:00
peppaJoeng
7c4eacd6ac upgrade to contained 1.6.21
Signed-off-by: vegbir <yangjiaqi16@huawei.com>
2023-07-21 08:11:52 +00:00
openeuler-ci-bot
b656c18aa9
!89 新增containerd高版本其他二进制
From: @dayshappy 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian
2023-05-29 08:27:56 +00:00
dayshappy
2c04bc7dbd add containerd-v2 binaries
Signed-off-by: dayshappy <zhangzhihui@xfusion.com>
2023-05-15 16:36:55 +08:00
openeuler-ci-bot
b343c2d0e2
!87 containerd: add check in spec
From: @xu_lei_123 
Reviewed-by: @zhangsong234, @duguhaotian 
Signed-off-by: @duguhaotian
2023-04-23 03:14:25 +00:00
xulei
3167fe1c3b containerd: add check in spec 2023-04-21 17:46:40 +08:00
openeuler-ci-bot
83ae1e49ce
!85 update to 1.6.20
From: @xu_lei_123 
Reviewed-by: @zhangsong234, @duguhaotian 
Signed-off-by: @duguhaotian
2023-04-20 08:58:48 +00:00
xu_lei_123
fe07df2fca update to 1.6.20 2023-04-19 21:50:35 +08:00
openeuler-ci-bot
044614a0a4
!78 containerd:fix CVE-2023-25153 and CVE-2023-25173
From: @zhong-jiawei-1 
Reviewed-by: @Vanient, @duguhaotian 
Signed-off-by: @duguhaotian
2023-02-27 09:24:19 +00:00
zhongjiawei
ca79c58f4e containerd:fix CVE-2023-25153 and CVE-2023-25173 2023-02-27 16:52:55 +08:00
openeuler-ci-bot
1e6e8dcba0
!69 [sync] PR-67: containerd:fix k8s build fail without import context
From: @openeuler-sync-bot 
Reviewed-by: @duguhaotian, @Vanient 
Signed-off-by: @duguhaotian
2022-12-15 09:18:13 +00:00
zhongjiawei
a2c40b0650 containerd:fix k8s build fail without import context
(cherry picked from commit cf1b0bc6ef5c80f78b1012246cd312b4dfa1c9a4)
2022-12-15 16:59:57 +08:00
openeuler-ci-bot
e29b1c3a4b
!64 [sync] PR-61: containerd:Fix CVE-2022-23471
From: @openeuler-sync-bot 
Reviewed-by: @Vanient, @duguhaotian 
Signed-off-by: @duguhaotian
2022-12-13 11:45:27 +00:00
zhongjiawei
3ca4395efe containerd:Fix goroutine leak in Exec
(cherry picked from commit 9fc75e44814de33a73f690764c2de4c7e9495efc)
2022-12-13 19:03:09 +08:00
openeuler-ci-bot
c829edc007
!58 [sync] PR-56: containerd: add ctr binary into package
From: @openeuler-sync-bot 
Reviewed-by: @Vanient, @duguhaotian 
Signed-off-by: @duguhaotian
2022-11-16 08:53:17 +00:00
zhongjiawei
67588f2d7b containerd: add ctr binary into package
(cherry picked from commit a3b05690f2c97b16018c4f236ea1a4fb782e9c4e)
2022-11-16 16:40:46 +08:00
openeuler-ci-bot
02587ebc88
!51 [sync] PR-50: containerd: fix version number wrong
From: @openeuler-sync-bot 
Reviewed-by: @Vanient, @duguhaotian 
Signed-off-by: @duguhaotian
2022-11-16 07:14:45 +00:00
zhongjiawei
371b59a846 containerd: fix version number wrong
(cherry picked from commit 6bbb86302fbc7c085c3f63d7e9cdd41570101549)
2022-11-16 14:30:59 +08:00