Merge pull request #1521 from mwieczorek/windows-default-network-type

Set windows containers default network mode to 'nat'
hashicorp · Aug 5, 2016 · 58adc15 · 58adc15
2 parents f3cd08f + d5ae1cb
commit 58adc15
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/client/driver/docker.go b/client/driver/docker.go
@@ -451,8 +451,8 @@ func (d *DockerDriver) createContainer(ctx *ExecContext, task *structs.Task,
 	hostConfig.NetworkMode = driverConfig.NetworkMode
 	if hostConfig.NetworkMode == "" {
 		// docker default
-		d.logger.Println("[DEBUG] driver.docker: networking mode not specified; defaulting to bridge")
-		hostConfig.NetworkMode = "bridge"
+		d.logger.Printf("[DEBUG] driver.docker: networking mode not specified; defaulting to %s", defaultNetworkMode)
+		hostConfig.NetworkMode = defaultNetworkMode
 	}
 
 	// Setup port mapping and exposed ports

diff --git a/client/driver/docker_default.go b/client/driver/docker_default.go
@@ -4,6 +4,11 @@ package driver
 
 import docker "github.com/fsouza/go-dockerclient"
 
+const (
+	//Setting default network mode for non-windows OS as bridge
+	defaultNetworkMode = "bridge"
+)
+
 func getPortBinding(ip string, port string) []docker.PortBinding {
 	return []docker.PortBinding{docker.PortBinding{HostIP: ip, HostPort: port}}
 }
diff --git a/client/driver/docker_windows.go b/client/driver/docker_windows.go
@@ -2,6 +2,11 @@ package driver
 
 import docker "github.com/fsouza/go-dockerclient"
 
+const (
+	//Default network mode for windows containers is nat
+	defaultNetworkMode = "nat"
+)
+
 //Currently Windows containers don't support host ip in port binding.
 func getPortBinding(ip string, port string) []docker.PortBinding {
 	return []docker.PortBinding{docker.PortBinding{HostIP: "", HostPort: port}}