Michael Crosby
365401703d
Clear nofity socket from containerd env
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-04-01 11:02:14 -07:00
Anusha Ragunathan
d9c3b653c0
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>
2016-03-30 12:26:59 -07:00
David Calavera
99adcaebc0
Merge pull request #21592 from anusha-ragunathan/docker-systemd
...
When using systemd, pass expected cgroupsPath and cli options to runc.
2016-03-29 17:00:10 -07:00
Anusha Ragunathan
7ed3d265a4
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>
2016-03-29 14:20:10 -07:00
Alexander Morozov
a7851e2556
libcontainerd: reuse our pkg/locker
...
it fixes race with access to containerMutexes
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-29 09:43:12 -07:00
Tonis Tiigi
0d9b94c4c5
Use separate exec-root for test daemons
...
Fixes #21545
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-28 17:38:14 -07:00
Michael Crosby
b0280c37a0
Remove grpc logging to stderr
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-23 15:41:47 -07:00
Tibor Vass
009399dc8e
Add docker- prefix to runc and containerd binaries
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-23 00:52:16 -04:00
Tonis Tiigi
9c4570a958
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>
2016-03-18 13:38:32 -07:00
