82 Commits

Author SHA1 Message Date
openeuler-ci-bot
75fe09e82b
!209 fix CVE-2024-40635
From: @jade_t 
Reviewed-by: @xuxuepeng 
Signed-off-by: @xuxuepeng
2025-03-19 08:17:20 +00:00
dongyuzhen
15e7d5a038 fix CVE-2024-40635 2025-03-19 15:06:01 +08:00
openeuler-ci-bot
de195cf03b
!190 containerd:modify make options
From: @zhong-jiawei-1 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
2024-06-12 03:49:59 +00:00
zhongjiawei
9aaa26c0db containerd:modify make options 2024-06-12 11:30:55 +08:00
openeuler-ci-bot
827e58cea2
!188 Add loong64 to THP patch, fix build error for loongarch64
From: @zhangzikang1992 
Reviewed-by: @yangzhao_kl 
Signed-off-by: @yangzhao_kl
2024-05-21 09:40:03 +00:00
zhangzikang1992
c17314efd7 Add loong64 to THP patch 2024-05-21 14:15:11 +08:00
openeuler-ci-bot
92f36428e3
!186 containerd:enable cri
From: @zhong-jiawei-1 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
2024-04-24 09:31:11 +00:00
zhongjiawei
87383d05a2 containerd:enable make cri 2024-04-23 19:19:58 +08:00
openeuler-ci-bot
dbadcd0fca
!184 containerd:modify Makefile for go build options
From: @zhong-jiawei-1 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
2024-04-07 02:14:07 +00:00
zhongjiawei
5d3c6499ce containerd:modify Makefile for go build options 2024-04-07 09:57:43 +08:00
openeuler-ci-bot
b42358d334
!180 [sync] PR-177: fix clang compile error due to "unknown flag -znow"
From: @openeuler-sync-bot 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
2024-04-07 01:28:26 +00:00
tiberium
abe9cb2e1c fix clang compile error due to flag format error
(cherry picked from commit d9e8e5d8bf6706bae01b691b7c718fd0616d6a83)
2024-04-02 09:02:44 +08:00
openeuler-ci-bot
475f3d5040
!178 containerd:remove stw gc sweep set for arm64
From: @zhong-jiawei-1 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
2024-03-22 06:43:07 +00:00
zhongjiawei
bacfecc5bb containerd:remove stw gc sweep set for arm64 2024-03-22 14:23:22 +08:00
openeuler-ci-bot
d7d2ba8e4b
!175 手工同步PR172
From: @laokz 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
2024-03-18 09:15:34 +00:00
laokz
e1f7bc4936 add riscv64 to THP patch 2024-03-16 16:12:10 +08:00
openeuler-ci-bot
91a2845c68
!173 [sync] PR-171: add Requires runc
From: @openeuler-sync-bot 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
2024-03-16 07:30:30 +00:00
duyiwei
72ba8c0fe4 add Requires runc
Signed-off-by: duyiwei <duyiwei@kylinos.cn>
(cherry picked from commit 3f5ff5ab907f2fe13befe808288e06b33e0682c5)
2024-03-15 15:16:27 +08: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