[FAB-15483] updated vendored docker client

Change-Id: I1aef842b2bebbcd367b8eabcab62bbb5b09f5e75
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: sykesm

Gopkg.lock

@@ -30,17 +30,7 @@ noverify = [
 
 [[constraint]]
   name = "github.com/fsouza/go-dockerclient"
-  version = "=1.3.0"
-
-# Pinned in support of go-dockerclient
-[[override]]
-  name = "github.com/docker/docker"
-  revision = "0c5f8d2b9b23ab8d23529b3effdcf53bb058298c"
-
-# Pinned in support of go-dockerclient
-[[override]]
-  name = "github.com/docker/libnetwork"
-  revision = "19279f0492417475b6bfbd0aa529f73e8f178fb5"
+  version = "1.3.0"
 
 [[constraint]]
   name = "github.com/golang/protobuf"

Gopkg.toml

@@ -1053,6 +1053,9 @@ func getDockerHostConfig() *docker.HostConfig {
 		networkMode = "host"
 	}
 
+	memorySwappiness := getInt64("MemorySwappiness")
+	oomKillDisable := viper.GetBool(dockerKey("OomKillDisable"))
+
 	return &docker.HostConfig{
 		CapAdd:  viper.GetStringSlice(dockerKey("CapAdd")),
 		CapDrop: viper.GetStringSlice(dockerKey("CapDrop")),
@@ -1071,8 +1074,8 @@ func getDockerHostConfig() *docker.HostConfig {
 		CgroupParent:     viper.GetString(dockerKey("CgroupParent")),
 		Memory:           getInt64("Memory"),
 		MemorySwap:       getInt64("MemorySwap"),
-		MemorySwappiness: getInt64("MemorySwappiness"),
-		OOMKillDisable:   viper.GetBool(dockerKey("OomKillDisable")),
+		MemorySwappiness: &memorySwappiness,
+		OOMKillDisable:   &oomKillDisable,
 		CPUShares:        getInt64("CpuShares"),
 		CPUSet:           viper.GetString(dockerKey("Cpuset")),
 		CPUSetCPUs:       viper.GetString(dockerKey("CpusetCPUs")),