Selaa lähdekoodia

Merge pull request #17531 from crosbymichael/no-set-reservation

Don't set mem soft limit if not specifiecd
Tibor Vass 9 vuotta sitten
vanhempi
commit
74362e8392
1 muutettua tiedostoa jossa 0 lisäystä ja 3 poistoa
  1. 0 3
      daemon/daemon_unix.go

+ 0 - 3
daemon/daemon_unix.go

@@ -115,9 +115,6 @@ func (daemon *Daemon) adaptContainerSettings(hostConfig *runconfig.HostConfig, a
 		// By default, MemorySwap is set to twice the size of Memory.
 		hostConfig.MemorySwap = hostConfig.Memory * 2
 	}
-	if hostConfig.MemoryReservation == 0 && hostConfig.Memory > 0 {
-		hostConfig.MemoryReservation = hostConfig.Memory
-	}
 }
 
 // verifyPlatformContainerSettings performs platform-specific validation of the