Merge pull request #7550 from hashicorp/vendor-fsouza-go-docker-clien…

…t-20200330 Vendor fsouza/go-docker-client update
hashicorp · Mar 31, 2020 · b1bf952 · b1bf952
2 parents 2604f70 + 2def8de
commit b1bf952
Show file tree

Hide file tree

Showing 89 changed files with 3,478 additions and 1,787 deletions.
diff --git a/drivers/docker/driver.go b/drivers/docker/driver.go
@@ -719,7 +719,7 @@ func (d *Driver) createContainerConfig(task *drivers.TaskConfig, driverConfig *T
 		StorageOpt:   driverConfig.StorageOpt,
 		VolumeDriver: driverConfig.VolumeDriver,
 
-		PidsLimit: driverConfig.PidsLimit,
+		PidsLimit: &driverConfig.PidsLimit,
 	}
 
 	if _, ok := task.DeviceEnv[nvidiaVisibleDevices]; ok {
@@ -748,9 +748,14 @@ func (d *Driver) createContainerConfig(task *drivers.TaskConfig, driverConfig *T
 	// Windows does not support MemorySwap/MemorySwappiness #2193
 	if runtime.GOOS == "windows" {
 		hostConfig.MemorySwap = 0
-		hostConfig.MemorySwappiness = -1
+		hostConfig.MemorySwappiness = nil
 	} else {
 		hostConfig.MemorySwap = task.Resources.LinuxResources.MemoryLimitBytes // MemorySwap is memory + swap.
+
+		// disable swap explicitly in non-Windows environments
+		var swapiness int64 = 0
+		hostConfig.MemorySwappiness = &swapiness
+
 	}
 
 	loggingDriver := driverConfig.Logging.Type

diff --git a/vendor/github.com/containerd/continuity/LICENSE b/vendor/github.com/containerd/continuity/LICENSE
diff --git a/vendor/github.com/containerd/continuity/fs/copy.go b/vendor/github.com/containerd/continuity/fs/copy.go