mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-17 15:13:08 +00:00
Passing memory swap limit -1 by default. Docker remote API never check if memory
swap is enabled by kernel or not, instead by default to set the limit to memory * 2, and return API error 500 if swap is not enabled.
This commit is contained in:
@@ -587,6 +587,7 @@ func (dm *DockerManager) runContainer(
|
||||
Image: container.Image,
|
||||
// Memory and CPU are set here for older versions of Docker (pre-1.6).
|
||||
Memory: memoryLimit,
|
||||
MemorySwap: -1,
|
||||
CPUShares: cpuShares,
|
||||
WorkingDir: container.WorkingDir,
|
||||
Labels: labels,
|
||||
@@ -637,8 +638,9 @@ func (dm *DockerManager) runContainer(
|
||||
NetworkMode: netMode,
|
||||
IpcMode: ipcMode,
|
||||
// Memory and CPU are set here for newer versions of Docker (1.6+).
|
||||
Memory: memoryLimit,
|
||||
CPUShares: cpuShares,
|
||||
Memory: memoryLimit,
|
||||
MemorySwap: -1,
|
||||
CPUShares: cpuShares,
|
||||
}
|
||||
if len(opts.DNS) > 0 {
|
||||
hc.DNS = opts.DNS
|
||||
|
Reference in New Issue
Block a user