Merge pull request #7428 from hashicorp/revert-7416-bump-go-dockerclient

Revert "vendor: fsouza/go-docker-client v1.6.3"
hashicorp · Mar 23, 2020 · 8efa104 · 8efa104
2 parents 382bbbe + 4822c66
commit 8efa104
Show file tree

Hide file tree

Showing 93 changed files with 769 additions and 3,485 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 {
@@ -747,10 +747,8 @@ func (d *Driver) createContainerConfig(task *drivers.TaskConfig, driverConfig *T
 
 	// Windows does not support MemorySwap/MemorySwappiness #2193
 	if runtime.GOOS == "windows" {
-		var swapiness int64 = 0
-
 		hostConfig.MemorySwap = 0
-		hostConfig.MemorySwappiness = &swapiness
+		hostConfig.MemorySwappiness = -1
 	} else {
 		hostConfig.MemorySwap = task.Resources.LinuxResources.MemoryLimitBytes // MemorySwap is memory + swap.
 	}

diff --git a/jobspec/test-fixtures/basic.hcl b/jobspec/test-fixtures/basic.hcl
@@ -293,7 +293,7 @@ job "binstore-storagelocker" {
       driver = "docker"
 
       lifecycle {
-        hook    = "prestart"
+        hook = "prestart"
         sidecar = true
       }
 

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
diff --git a/vendor/github.com/containerd/continuity/fs/copy_linux.go b/vendor/github.com/containerd/continuity/fs/copy_linux.go