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

Initialize swappiness in libcontainer cgroups template
2015-06-25 11:36:54 -07:00 · 2015-06-25 11:36:54 -07:00 · c281549610
commit c281549610
parent e8b87cfce1 9e9d227677
1 changed files with 3 additions and 2 deletions
--- a/daemon/execdriver/native/template/default_template.go
+++ b/daemon/execdriver/native/template/default_template.go
@ -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{
 			{