66 Commits

Author SHA1 Message Date
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
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
openeuler-ci-bot
868f49dcd4
!48 [sync] PR-47: containerd: bugfix and add CGO security build option
From: @openeuler-sync-bot 
Reviewed-by: @Vanient, @duguhaotian 
Signed-off-by: @duguhaotian
2022-09-22 12:01:07 +00:00
zhongjiawei
d49c9d0693 containerd: bugfix and add CGO security build option
(cherry picked from commit eb136438cf63fae5754c31920a6bf8afaeded135)
2022-09-22 19:38:32 +08:00
openeuler-ci-bot
8f8cc81338
!42 [sync] PR-41: fix CVE-2022-31030
### 1. Origin pull request:
https://gitee.com/src-openeuler/containerd/pulls/41

### 2. Original pull request related issue(s):
https://gitee.com/src-openeuler/containerd/issues/I5BLIU

### 3. Original pull request related commit(s):
| Sha | Datetime | Message |
|---|---|---|
|[0436d058](0436d058b3)|2022-07-04 17:06:29 +0800 CST|containerd: Limit the response size of ExecSync<br><br>fix CVE-2022-31030<br><br>Signed-off-by: zhongjiawei <zhongjiawei1@huawei.com><br>|
 
From: @openeuler-sync-bot 
Reviewed-by: @zhangsong234, @duguhaotian 
Signed-off-by: @duguhaotian
2022-07-04 11:17:25 +00:00
zhongjiawei
8bbd2f34fd containerd: Limit the response size of ExecSync
fix CVE-2022-31030

Signed-off-by: zhongjiawei <zhongjiawei1@huawei.com>
(cherry picked from commit 0436d058b39572dfa0d0a267b0518fd8a793dc49)
2022-07-04 17:24:32 +08:00
openeuler-ci-bot
df345ee071
!36 containerd:put get pid lock after set process exited to avoid deadlock
From: @zhangsong234 
Reviewed-by: @Vanient, @duguhaotian 
Signed-off-by: @duguhaotian
2022-07-04 08:25:56 +00:00
zhangsong234
5cff214452 containerd:put get pid lock after set process exited to avoid deadlock
Signed-off-by: zhangsong234 <zhangsong34@huawei.com>
2022-06-22 14:47:29 +08:00
openeuler-ci-bot
f97170f61e
!35 【同步pr】修复混乱的release:补齐109;containerd:Use fs.RootPath when mounting volumes
From: @duyiwei7w 
Reviewed-by: @yangzhao_kl 
Signed-off-by: @yangzhao_kl
2022-05-26 06:47:28 +00:00
duyiwei
49ca531746 containerd:Use fs.RootPath when mounting volumes 2022-05-23 10:34:51 +08:00
openeuler-ci-bot
0c646f82b3
!27 containerd: update patches
Merge pull request !27 from songyanting/master
2022-01-27 01:26:41 +00:00
songyanting
19583b7229 containerd: update patches
0069-containerd-add-check-in-spec.patch
0070-containerd-kill-container-init-process-if-runc-start.patch
0071-containerd-fix-containerd-shim-residual-when-kill-co.patch
0072-containerd-fix-deadlock-on-commit-error.patch
0073-containerd-backport-upstream-patches.patch
0074-containerd-fix-exec-event-missing-due-to-pid-reuse.patch
0075-containerd-fix-dm-left-when-pause-contaienr-and-kill-shim.patch
0076-containerd-fix-start-container-failed-with-id-exists.patch
0077-containerd-drop-opt-package.patch
0078-containerd-bump-containerd-ttrpc-699c4e40d1.patch
0079-containerd-fix-race-access-for-mobySubcribed.patch
0080-containerd-improve-log-for-debugging.patch
0081-containerd-reduce-permissions-for-bundle-di.patch
0082-containerd-fix-publish-command-wait-block-for.patch
0083-containerd-optimize-cgo-compile-options.patch

Signed-off-by:songyanting <songyanting@huawei.com>
2022-01-26 20:03:57 +08:00
openeuler-ci-bot
92442044c0 !17 containerd: compile option compliance
From: @Vanient
Reviewed-by: @jing-rui,@caihaomin
Signed-off-by: @caihaomin
2021-03-18 15:12:28 +08:00
xiadanni
9c4ff3a46f containerd: compile option compliance
Signed-off-by: xiadanni <xiadanni1@huawei.com>
2021-03-18 10:42:53 +08:00
xiadanni
349a80d77f sync patches
1. check task list to avoid unnecessary cleanup.
2. fix dead loop
3. cleanup dangling shim by brand new context
4. fix potential panic for task in unknown state

Signed-off-by: xiadanni <xiadanni1@huawei.com>
2021-03-18 10:20:49 +08:00
openeuler-ci-bot
9a29a38c55 !13 containerd:all:add some symbol for riscv
From: @riscv-spare
Reviewed-by: @jing-rui
Signed-off-by: @jing-rui
2021-01-15 11:31:37 +08:00