Browse Source

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

Initialize swappiness in libcontainer cgroups template
Alexander Morozov 10 years ago
parent
commit
c281549610
1 changed files with 3 additions and 2 deletions
  1. 3 2
      daemon/execdriver/native/template/default_template.go

+ 3 - 2
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{
 			{