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

20 Commits

Author SHA1 Message Date
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
David Calavera
087b91dfb7 Merge pull request #21679 from tonistiigi/no-pivot-root 
Bring back support for DOCKER_RAMDISK
Upstream-commit: 00031c15b5b2226292eb9575bc3b390bdcd83a56
Component: engine
 2016-03-31 12:40:57 -07:00
Tonis Tiigi
1917da0dad Bring back support for DOCKER_RAMDISK 
Fixes #21631

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8a4225cd5ad3ad56a7e896f675080c0ed38982a3
Component: engine
 2016-03-31 10:29:32 -07:00
Sebastiaan van Stijn
dc5103ac67 Merge pull request #21637 from tonistiigi/refactor-cleanup 
Fix container mount cleanup issues
Upstream-commit: c7b63338f0c46b2ca0efee3b8a590c2e2033ea14
Component: engine
 2016-03-30 23:25:23 -07:00
Tonis Tiigi
2da8076367 Fix container mount cleanup issues 
- Refactor generic and path based cleanup functions into a single function.
- Include aufs and zfs mounts in the mounts cleanup.
- Containers that receive exit event on restore don't require manual cleanup.
- Make missing sandbox id message a warning because currently sandboxes are always cleared on startup. libnetwork#975
- Don't unmount volumes for containers that don't have base path. Shouldn't be needed after #21372

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 05cc737f5411a0effd299429140d031c4ad8dd05
Component: engine
 2016-03-30 17:25:49 -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
Alexander Morozov
ff692d79a4 Merge pull request #21599 from tonistiigi/separate-daemon-exec-root 
Use separate exec-root for test daemons
Upstream-commit: d33480474f33523743ae49c1b96737fbfbeb1a6f
Component: engine
 2016-03-29 07:52:18 -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
Dmitri Logvinenko
e155de707d Fix misspellings 
Signed-off-by: Dmitri Logvinenko <dmitri.logvinenko@gmail.com>
Upstream-commit: 6dede879fd8e0c5f599631d125753d360ead3bc0
Component: engine
 2016-03-28 16:21:02 +03:00
Brian Goff
51e700f816 Merge pull request #21460 from tonistiigi/exec-ulimits 
Add ulimit support to libcontainerd addprocess
Upstream-commit: 57575a2695a822eb19bda555b1dbb9451d2c0881
Component: engine
 2016-03-24 09:38:21 -04:00
Tonis Tiigi
e716bd46e9 Add ulimit support to libcontainerd addprocess 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8891afd8385aeb490f8b7d9db8c3828bc7d24dc1
Component: engine
 2016-03-23 19:54:32 -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
John Howard
d4fa46cb38 Windows: Minimal docker top implementation 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 52237787fa82c12b018d71b1e00f28492be35dad
Component: engine
 2016-03-20 16:45:53 -07:00
John Howard
c70fa5552d Windows: libcontainerd cleanup 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e331df5aeefc1ebaa7a79ceb78350aba8cdabba1
Component: engine
 2016-03-18 20:31:11 -07:00
John Howard
a76e16e99f Windows libcontainerd implementation 
Signed-off-by: John Howard <jhoward@microsoft.com>
Signed-off-by: John Starks <jostarks@microsoft.com>
Signed-off-by: Darren Stahl <darst@microsoft.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 94d70d835500bec3b171425271916d3e40f29635
Component: engine
 2016-03-18 13:38:41 -07: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