45 Commits

Author SHA1 Message Date
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
yangyanchao
056f26dd1e containerd:all:add some symbol for riscv 2021-01-15 03:26:45 +00:00
openeuler-ci-bot
74a1fc61f9 !7 containerd: update patches
From: @Vanient
Reviewed-by: @jing-rui
Signed-off-by: @jing-rui
2020-11-25 17:27:39 +08:00
xiadanni
dccab1cbca containerd: update patches
0059-containerd-add-GO_GCFLAGS-to-containerd-shim-making.patch
0060-containerd-do-not-disable-cgo-in-containerd-shim-mak.patch
0061-containerd-check-if-bundle-exists-before-create-bund.patch
0062-containerd-use-path-based-socket-for-shims.patch
0063-containerd-kill-init-directly-if-runtime-kill-failed.patch

Signed-off-by: xiadanni <xiadanni1@huawei.com>
2020-11-25 11:08:13 +08:00
openeuler-ci-bot
bfe7452e77 !6 containerd: fix apply-patch fail
From: @Vanient
Reviewed-by: @jing-rui
Signed-off-by: @jing-rui
2020-09-15 17:15:29 +08:00
xiadanni
2b19a2aacf containerd: fix apply-patch fail
Signed-off-by: xiadanni <xiadanni1@huawei.com>
2020-09-15 09:38:58 +08:00
openeuler-ci-bot
8d736eba1c !5 containerd: fix SOURCE0 addr
From: @Vanient
Reviewed-by: @jing-rui
Signed-off-by: @jing-rui
2020-09-14 20:16:17 +08:00
xiadanni
9de0263d1f containerd: fix SOURCE0 addr
Signed-off-by: xiadanni <xiadanni1@huawei.com>
2020-09-14 14:58:02 +08:00
openeuler-ci-bot
ec66a0f933 !4 add yaml file in package
Merge pull request !4 from 吴超超/master
2020-07-02 18:54:45 +08:00
19909236985
8271fd00f5 add yaml file in package 2020-06-17 09:55:47 +08:00
openeuler-ci-bot
e9b83b9cef !3 containerd: use git-commit to store commit ID
Merge pull request !3 from zvier/master
2020-06-15 16:24:33 +08:00
liuzekun
bada571c96 containerd: use git-commit to store commit ID
Signed-off-by: liuzekun <liuzekun@huawei.com>
2020-06-15 04:54:01 -04:00
openeuler-ci-bot
93cdc66ff6 !2 containerd: add patches
Merge pull request !2 from Grooooot/master
2020-03-06 17:28:16 +08:00
Grooooot
3a981f1909 containerd:add patches
Signed-off-by: Grooooot <isula@huawei.com>
2020-03-05 15:54:34 +08:00
openeuler-ci-bot
4848bdbebd !1 first commit
Merge pull request !1 from openeuler-basic/master
2019-12-30 14:15:03 +08:00
Grooooot
7b8aa4184d first commit 2019-12-30 12:24:38 +08:00
openeuler-ci-bot
cc4fbfeb56 Initial commit 2019-12-30 11:44:37 +08:00