Merge pull request #14030 from estesp/init-memory-swappiness

Initialize swappiness in libcontainer cgroups template Upstream-commit: c2815496101e7523c8bc2e459026f8c5e84cdb08 Component: engine
2015-06-25 11:36:54 -07:00
parent a6a8015e93 824de2eaf8
commit f74cf65168
1 changed files with 3 additions and 2 deletions
@@ -36,8 +36,9 @@ func New() *configs.Config {
 			{Type: "NEWNET"},
 		}),
 		Cgroups: &configs.Cgroup{
-			Parent:          "docker",
-			AllowAllDevices: false,
+			Parent:           "docker",
+			AllowAllDevices:  false,
+			MemorySwappiness: -1,
 		},
 		Mounts: []*configs.Mount{
 			{