Merge pull request #18395 from LK4D4/default_cgroup_is_not_daemon

Use /docker as cgroup parent instead of docker Upstream-commit: ff69b23dc09e544fb8ae9dccbd1f7992d2005b70 Component: engine
2015-12-17 13:59:00 -08:00
parent 0f2a0bed09 329ce171d3
commit 5eac08b5e9
1 changed files with 1 additions and 1 deletions
--- a/components/engine/daemon/execdriver/native/template/default_template_linux.go
+++ b/components/engine/daemon/execdriver/native/template/default_template_linux.go
@ -40,7 +40,7 @@ func New() *configs.Config {
 			{Type: "NEWUSER"},
 		}),
 		Cgroups: &configs.Cgroup{
-			Parent:           "docker",
+			Parent:           "/docker",
 			AllowAllDevices:  false,
 			MemorySwappiness: -1,
 		},