Merge pull request #1480 from hashicorp/b-docker-disable-swap

Disable swap on docker driver
hashicorp · Jul 28, 2016 · 1b94f5c · 1b94f5c
2 parents 0ba27fb + 402d69b
commit 1b94f5c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/client/driver/docker.go b/client/driver/docker.go
@@ -386,10 +386,11 @@ func (d *DockerDriver) createContainer(ctx *ExecContext, task *structs.Task,
 		OpenStdin: driverConfig.Interactive,
 	}
 
+	memLimit := int64(task.Resources.MemoryMB) * 1024 * 1024
 	hostConfig := &docker.HostConfig{
 		// Convert MB to bytes. This is an absolute value.
-		Memory:     int64(task.Resources.MemoryMB) * 1024 * 1024,
-		MemorySwap: -1,
+		Memory:     memLimit,
+		MemorySwap: memLimit, // MemorySwap is memory + swap.
 		// Convert Mhz to shares. This is a relative value.
 		CPUShares: int64(task.Resources.CPU),