138 Commits

Author SHA1 Message Date
openeuler-ci-bot
bf0cca49a9 !43 rollback if docker restart when doing BlkDiscard
From: @wangfengtu
Reviewed-by: @jing-rui,@caihaomin
Signed-off-by: @caihaomin
2021-04-02 14:03:37 +08:00
WangFengTu
82696f6e38 rollback if docker restart when doing BlkDiscard
Signed-off-by: WangFengTu <wangfengtu@huawei.com>
2021-04-01 16:25:19 +08:00
openeuler-ci-bot
41aa094cbe !38 docker:sync bugfix and fix CVE-2021-21284 2021-21285
From: @Vanient
Reviewed-by: @jing-rui,@caihaomin
Signed-off-by: @caihaomin
2021-03-19 11:18:09 +08:00
xiadanni
1bae2e5ea3 docker:sync bugfix and fix CVE-2021-21284 2021-21285
1.fix execCommands leak in health-check
2.check containerd pid before kill it
3.fix CVE-2021-21284
4.fix CVE-2021-21285

Change-Id: I2fe1dd40281f1786ecc63ff19d416b113710e611
Signed-off-by: xiadanni <xiadanni1@huawei.com>
2021-03-18 15:40:53 +08:00
openeuler-ci-bot
773302aeb3 !30 docker: remove go-md2man build require
From: @DCCooper
Reviewed-by: @jingxiaolu,@caihaomin
Signed-off-by: @caihaomin
2021-02-09 19:05:15 +08:00
DCCooper
0f204a4fd6 docker:remove go-md2man build require
Signed-off-by: DCCooper <1866858@gmail.com>
2021-02-09 18:51:03 +08:00
openeuler-ci-bot
791686bbfe !26 docker: sync bugfix
From: @jing-rui
Reviewed-by: @flyflyflypeng
Signed-off-by: @flyflyflypeng
2021-01-19 14:15:08 +08:00
jingrui
af6293703d docker: sync bugfix
Change-Id: I4dc92059d90415199fcd143d75cc68cfdb67c430
Signed-off-by: jingrui <jingrui@huawei.com>
2021-01-19 14:03:29 +08:00
openeuler-ci-bot
baf4fbe362 !20 support the riscv
From: @riscv-spare
Reviewed-by: @jing-rui
Signed-off-by: @jing-rui
2021-01-15 10:22:13 +08:00
yangyanchao
4780a2ff0e docker:components:add config files for riscv
Signe:-off-by: yangyanchao <yangyanchao6@huawei.com>
2021-01-04 10:45:04 +08:00
openeuler-ci-bot
a6a851b83b !18 docker: append the passed hostname to the endpoint when pull image with mirror
From: @abelvon
Reviewed-by: @jing-rui
Signed-off-by: @jing-rui
2020-12-21 16:57:07 +08:00
f00231050
27493a1bf2 docker: fix registry not try hostname issue
reason: when mirror is matched, only matched mirror endpoint is added to endpoint list, but the hostname itself is not in the list, which is not compatible with the case of docker.io, docker.io will be appended to the last of the endpoint list.
2020-12-21 09:46:50 +08:00
openeuler-ci-bot
63ea1458e1 !10 sync patches from internal
From: @zvier
Reviewed-by: @jing-rui,@jing-rui
Signed-off-by: @jing-rui,@jing-rui
2020-11-28 09:39:36 +08:00
liuzekun
294a810705 docker: sync patches from internal
Signed-off-by: liuzekun <liuzekun@huawei.com>
2020-11-28 09:37:25 +08:00
openeuler-ci-bot
47add6b492 !9 spec: modify spec name
From: @Vanient
Reviewed-by: @chenyanpanHW
Signed-off-by:
2020-11-09 17:39:51 +08:00
xiadanni
d6bf1f41cc spec: modify spec name
Signed-off-by: xiadanni <xiadanni1@huawei.com>
2020-11-09 16:40:06 +08:00
openeuler-ci-bot
71354c6987 !12 docker: fix apply-patch fail
From: @Vanient
Reviewed-by: @jing-rui
Signed-off-by: @jing-rui
2020-09-15 14:49:08 +08:00
xiadanni
24a0ac0671 docker: fix apply-patch fail
Signed-off-by: xiadanni <xiadanni1@huawei.com>
2020-09-15 10:42:23 +08:00
openeuler-ci-bot
fcfee609dc !11 docker: fix SOURCE0 addr
From: @Vanient
Reviewed-by: @jing-rui
Signed-off-by: @jing-rui
2020-09-14 15:51:25 +08:00
xiadanni
8cd4d200f6 docker: fix SOURCE0 addr
Signed-off-by: xiadanni <xiadanni1@huawei.com>
2020-09-14 14:46:45 +08:00
openeuler-ci-bot
4b158210db !8 docker: add yaml file in package
Merge pull request !8 from Vanient/master
2020-07-07 14:16:29 +08:00
openeuler-ci-bot
c8ea5bd4df !6 docker: sync daemon pkg to cli vendor
Merge pull request !6 from jing-rui/master
2020-07-06 19:00:23 +08:00
jingrui
a7fbe55e45 docker: sync daemon pkg to cli vendor
Change-Id: I3f272af66670959fc7d42d5be2526ebf7f9eecfb
Signed-off-by: jingrui <jingrui@huawei.com>
2020-07-06 18:56:50 +08:00
xiadanni
dc817624b1 docker: add yaml file in package
Signed-off-by: xiadanni <xiadanni1@huawei.com>
2020-07-06 10:16:43 +08:00
openeuler-ci-bot
7452979469 !7 docker: use git-commit to store commit ID
Merge pull request !7 from Vanient/master
2020-06-24 15:47:54 +08:00
xiadanni1
07877c6fda docker: use git-commit to store commit ID
Change-Id: Id13ecdba61708f62595d6db593c670c304abf0bb
Signed-off-by: xiadanni1 <xiadanni1@huawei.com>
2020-06-16 02:07:26 +08:00
openeuler-ci-bot
1285aa4865 !5 check whether exit file is exist before kill process directly
Merge pull request !5 from zvier/master
2020-04-18 15:28:43 +08:00
liuzekun
c0d5f8afd5 docker: check whether exit file is exist before kill process directly
kill process directly should check whether exit file is exist already,
for avoid kill the new process which reused this pid

Signed-off-by: liuzekun <liuzekun@huawei.com>
2020-04-10 17:13:31 +08:00
liuzekun
80f048e31f Merge branch 'master' of https://gitee.com/zvier/docker 2020-04-10 17:07:50 +08:00
openeuler-ci-bot
83c38817b5 !4 'delete event' is not need to process in daemon processEvent
Merge pull request !4 from zvier/master
2020-04-10 11:34:17 +08:00
liuzekun
9f71f40e9f docker: 'delete event' is not need to process in daemon processEvent
Signed-off-by: liuzekun <liuzekun@huawei.com>
2020-04-10 11:01:16 +08:00
liuzekun
45c40a4d9c docker: 'delete event' is not need to process in daemon processEvent
Signed-off-by: liuzekun <liuzekun@huawei.com>
2020-04-10 10:58:04 +08:00
openeuler-ci-bot
0777be28b5 !3 docker: Delete stale containerd object on start failure
Merge pull request !3 from Grooooot/master
2020-04-10 10:53:10 +08:00
Grooooot
76b6c4c1b3 docker: Delete stale containerd object on start failure
containerd has two objects with regard to containers.
This is a "container" object which is metadata and a "task" which is
manging the actual runtime state.

When docker starts a container, it creates both the container metadata
and the task at the same time. So when a container exists, docker deletes
both of these objects as well.

This ensures that if, on start, when we go to create the container metadata object
in containerd, if there is an error due to a name conflict taht we go
ahead and clean that up and try again.

backport from upstream: https://github.com/moby/moby/pull/38364

Signed-off-by: Grooooot <isula@huawei.com>
2020-03-17 10:49:57 +08:00
openeuler-ci-bot
62eb84806e !2 docker: add patches
Merge pull request !2 from Grooooot/master
2020-03-05 19:16:01 +08:00
Grooooot
e7de2c79b3 docker: add patches
Signed-off-by: Grooooot <isula@huawei.com>
2020-03-05 15:13:09 +08:00
dogsheng
be56a4fe89 Package init 2019-12-25 19:10:46 +08:00
overweight
6138d366d1 Package init 2019-09-30 10:37:25 -04:00