p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,756 Commits 2 Branches 295 Tags
8cd702acc5ddfb5c19ddd188b128a5473fca2e7a
Commit Graph

10 Commits

Author SHA1 Message Date
Zhang Wei
f63a31e0b9 Remove rpc error when shut down daemon 
RPC connection closing error will be reported every time we shutdown
daemon, this error is expected, so we should remove this error to avoid
confusion to user.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: a02ae66d361464cc24bec4fb6aa5778c9d5b8cda
Component: engine
 2016-04-16 16:53:33 +08:00
Michael Crosby
8f70026df5 Clear nofity socket from containerd env 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 365401703d382861e86072d2813c2eacae56000f
Component: engine
 2016-04-01 11:02:14 -07:00
Anusha Ragunathan
210579a75f Redirect containerd stdout/stderr to the docker stream. 
Its useful to have containerd logs as part of docker.
Containerd metrics are too chatty, so set interval to 0.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: d9c3b653c0776bdfc4af9129ebbf41160a793cf3
Component: engine
 2016-03-30 12:26:59 -07:00
David Calavera
5888c28b47 Merge pull request #21592 from anusha-ragunathan/docker-systemd 
When using systemd, pass expected cgroupsPath and cli options to runc.
Upstream-commit: 99adcaebc0aca57f2665f356e4a9b4218aa5d5f7
Component: engine
 2016-03-29 17:00:10 -07:00
Anusha Ragunathan
3b9321568d When using systemd, pass expected cgroupsPath and cli options to runc. 
runc expects a systemd cgroupsPath to be in slice:scopePrefix:containerName
format and the "--systemd-cgroup" option to be set. Update docker accordingly.

Fixes 21475

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 7ed3d265a4499ec03f10537fea0aac3ebaa0cec6
Component: engine
 2016-03-29 14:20:10 -07:00
Alexander Morozov
c23ab72e75 libcontainerd: reuse our pkg/locker 
it fixes race with access to containerMutexes

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a7851e2556edb3e5333b6fe53160755fb5b7d616
Component: engine
 2016-03-29 09:43:12 -07:00
Tonis Tiigi
40995de161 Use separate exec-root for test daemons 
Fixes #21545

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 0d9b94c4c5d6b4f03a7a86e731e4110e9f27a51e
Component: engine
 2016-03-28 17:38:14 -07:00
Michael Crosby
ef87795248 Remove grpc logging to stderr 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: b0280c37a08a77871947b1045073601deb601eaa
Component: engine
 2016-03-23 15:41:47 -07:00
Tibor Vass
ce07920e99 Add docker- prefix to runc and containerd binaries 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 009399dc8ed8a4b635b0e229bf07b685e286d8d9
Component: engine
 2016-03-23 00:52:16 -04:00
Tonis Tiigi
8ba16d91c8 Replace execdrivers with containerd implementation 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 9c4570a958df42d1ad19364b1a8da55b891d850a
Component: engine
 2016-03-18 13:38:32 -07:00