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
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
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
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
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
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
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
