54 Commits

Author SHA1 Message Date
openeuler-ci-bot
e9cf5d9e41
!151 [sync] PR-147: containerd:update vendored golang.org/x/net
From: @openeuler-sync-bot 
Reviewed-by: @flyflyflypeng 
Signed-off-by: @flyflyflypeng
2024-02-06 11:04:38 +00:00
zhongjiawei
4bf1ad0c53 containerd:update vendored golang.org/x/net
(cherry picked from commit 2af6d2826a887bd399e9af2656c4cd59aa29a1f7)
2024-02-06 16:16:47 +08:00
openeuler-ci-bot
f76f0a4bb7
!144 [sync] PR-140: containerd:fix CVE-2023-39325
From: @openeuler-sync-bot 
Reviewed-by: @flyflyflypeng 
Signed-off-by: @flyflyflypeng
2024-01-31 03:24:43 +00:00
zhongjiawei
4b1c9ac975 containerd: fix CVE-2023-39325
(cherry picked from commit 7e7607cc8e11da0a66bd82a997f2064ee1f3b166)
2024-01-30 15:26:59 +08:00
openeuler-ci-bot
7f459b4996
!133 [sync] PR-132: containerd:sync some patches
From: @openeuler-sync-bot 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
2023-12-21 09:21:56 +00:00
zhongjiawei
23d3fdb129 containerd:symc some patches
(cherry picked from commit df5431744ecee9e4aeb33a52278fec636909cb42)
2023-12-21 16:49:26 +08:00
openeuler-ci-bot
2c2d33006c
!126 [sync] PR-121: containerd:bump ttrpc to fix containerd-shim socket connect increase leak after restart docker
From: @openeuler-sync-bot 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian
2023-11-08 09:37:14 +00:00
zhongjiawei
12606dce93 containerd:bump ttrpc to fix containerd-shim socket connect increase leak after restart docker
(cherry picked from commit 6da25d17bd95cbbe986f0bc55f95a4dda6adb39a)
2023-11-08 16:57:53 +08:00
openeuler-ci-bot
1aecea47f0
!112 sync some patchs form SP1
From: @panchenbo 
Reviewed-by: @zhong-jiawei-1, @duguhaotian 
Signed-off-by: @duguhaotian
2023-09-25 03:53:09 +00:00
panchenbo
8b542090b3 sync some patchs form SP1 2023-09-22 13:58:07 +08:00
openeuler-ci-bot
15d1f66e89
!94 containerd:fix journald stop container shim log stuck bug
From: @zhong-jiawei-1 
Reviewed-by: @Vanient, @duguhaotian 
Signed-off-by: @duguhaotian
2023-06-16 09:25:23 +00:00
zhongjiawei
8f3e5afd4d containerd:fix journald stop container shim log stuck bug 2023-06-16 16:19:30 +08:00
openeuler-ci-bot
53583f437b
!81 [sync] PR-78: containerd:fix CVE-2023-25153 and CVE-2023-25173
From: @openeuler-sync-bot 
Reviewed-by: @Vanient, @duguhaotian 
Signed-off-by: @duguhaotian
2023-02-27 10:58:36 +00:00
zhongjiawei
28c9716817 containerd:fix CVE-2023-25153 and CVE-2023-25173
(cherry picked from commit ca79c58f4e11665304c905b0528d6ae77f4b6aa4)
2023-02-27 17:24:31 +08:00
openeuler-ci-bot
f97af82063
!70 [sync] PR-67: containerd:fix k8s build fail without import context
From: @openeuler-sync-bot 
Reviewed-by: @Vanient, @duguhaotian 
Signed-off-by: @duguhaotian
2022-12-15 09:18:28 +00:00
zhongjiawei
2f615ddb8f containerd:fix k8s build fail without import context
(cherry picked from commit cf1b0bc6ef5c80f78b1012246cd312b4dfa1c9a4)
2022-12-15 17:00:06 +08:00
openeuler-ci-bot
1c588ccdb7
!65 [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:33 +00:00
zhongjiawei
851807d47a containerd:Fix goroutine leak in Exec
(cherry picked from commit 9fc75e44814de33a73f690764c2de4c7e9495efc)
2022-12-13 19:03:14 +08:00
openeuler-ci-bot
c037838ded
!59 [sync] PR-56: containerd: add ctr binary into package
From: @openeuler-sync-bot 
Reviewed-by: @duguhaotian, @Vanient 
Signed-off-by: @duguhaotian
2022-11-16 08:53:15 +00:00
zhongjiawei
33b74a365f containerd: add ctr binary into package
(cherry picked from commit a3b05690f2c97b16018c4f236ea1a4fb782e9c4e)
2022-11-16 16:40:53 +08:00
openeuler-ci-bot
7fe39167c9
!52 [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:49 +00:00
zhongjiawei
61ec51a929 containerd: fix version number wrong
(cherry picked from commit 6bbb86302fbc7c085c3f63d7e9cdd41570101549)
2022-11-16 14:31:04 +08:00
openeuler-ci-bot
40cf971aca
!49 [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:08 +00:00
zhongjiawei
a5844a0a7a containerd: bugfix and add CGO security build option
(cherry picked from commit eb136438cf63fae5754c31920a6bf8afaeded135)
2022-09-22 19:38:37 +08:00
openeuler-ci-bot
9098bd8b53
!45 [sync] PR-41: fix CVE-2022-31030
From: @openeuler-sync-bot 
Reviewed-by: @Vanient, @duguhaotian 
Signed-off-by: @duguhaotian
2022-09-22 10:40:09 +00:00
zhongjiawei
1cecbd1328 containerd: Limit the response size of ExecSync
fix CVE-2022-31030

Signed-off-by: zhongjiawei <zhongjiawei1@huawei.com>
(cherry picked from commit 0436d058b39572dfa0d0a267b0518fd8a793dc49)
2022-09-22 16:12:30 +08:00
openeuler-ci-bot
e0196373e1
!39 [sync] PR-36: containerd:put get pid lock after set process exited to avoid deadlock
From: @openeuler-sync-bot 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian
2022-07-04 08:40:17 +00:00
zhangsong234
4e69ecc42c containerd:put get pid lock after set process exited to avoid deadlock
Signed-off-by: zhangsong234 <zhangsong34@huawei.com>
(cherry picked from commit 5cff2144523054a3492c916f9acacc9a34b2a24f)
2022-07-04 16:26:03 +08:00
openeuler-ci-bot
6623aa0323
!34 【同步pr】containerd:Use fs.RootPath when mounting volumes
From: @duyiwei7w 
Reviewed-by: @yangzhao_kl 
Signed-off-by: @yangzhao_kl
2022-05-26 06:48:02 +00:00
duyiwei
50373873fc containerd:Use fs.RootPath when mounting volumes 2022-05-23 10:32:11 +08:00
openeuler-ci-bot
516e65ba9f
!29 [sync] PR-28: containerd: update patches
From: @openeuler-sync-bot 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian
2022-04-27 01:42:42 +00:00
Vanient
048f008c4f 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>
Signed-off-by: Vanient <xiadanni1@huawei.com>
(cherry picked from commit 9bf55eea9cc2c493286e993f49e1ff856f37b4ec)
2022-03-23 09:45:57 +08:00
openeuler-ci-bot
0fe5b188c8
!24 containerd:disable go module build as go1.17 enable it by default
Merge pull request !24 from Vanient/openEuler-22.03-LTS-Next
2022-01-10 12:44:26 +00:00
xiadanni
21b8ac999c containerd:disable go module build as go1.17 enable it by default
Signed-off-by: xiadanni <xiadanni1@huawei.com>
2022-01-10 16:08:11 +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