changelog

CHANGELOG.md

@@ -37,6 +37,7 @@ BUG FIXES:
     [GH-1454]
   * driver/docker: Disable swap on docker driver [GH-1480]
   * driver/docker: Fix improper gating on priviledged mode [GH-1506]
+  * driver/docker: Default network type is "nat" on Windows [GH-1521]
   * driver/docker: Cleanup created volume when destroying container [GH-1519]
 
 ## 0.4.0

client/driver/docker.go

@@ -80,7 +80,7 @@ type DockerDriverConfig struct {
 	Command          string              `mapstructure:"command"`            // The Command/Entrypoint to run when the container starts up
 	Args             []string            `mapstructure:"args"`               // The arguments to the Command/Entrypoint
 	IpcMode          string              `mapstructure:"ipc_mode"`           // The IPC mode of the container - host and none
-	NetworkMode      string              `mapstructure:"network_mode"`       // The network mode of the container - host, net and none
+	NetworkMode      string              `mapstructure:"network_mode"`       // The network mode of the container - host, nat and none
 	PidMode          string              `mapstructure:"pid_mode"`           // The PID mode of the container - host and none
 	UTSMode          string              `mapstructure:"uts_mode"`           // The UTS mode of the container - host and none
 	PortMapRaw       []map[string]int    `mapstructure:"port_map"`           //

client/driver/docker_default.go

@@ -5,7 +5,7 @@ package driver
 import docker "github.com/fsouza/go-dockerclient"
 
 const (
-	//Setting default network mode for non-windows OS as bridge
+	// Setting default network mode for non-windows OS as bridge
 	defaultNetworkMode = "bridge"
 )
 

client/driver/docker_windows.go

@@ -3,7 +3,7 @@ package driver
 import docker "github.com/fsouza/go-dockerclient"
 
 const (
-	//Default network mode for windows containers is nat
+	// Default network mode for windows containers is nat
 	defaultNetworkMode = "nat"
 )
 

website/source/docs/drivers/docker.html.md

@@ -77,10 +77,11 @@ The following options are available for use in the job specification.
 
 * `network_mode` - (Optional) The network mode to be used for the container. In
   order to support userspace networking plugins in Docker 1.9 this accepts any
-  value. The default is `bridge`. Other networking modes may not work without
-  additional configuration on the host (which is outside the scope of Nomad).
-  Valid values pre-docker 1.9 are `default`, `bridge`, `host`, `none`, or
-  `container:name`. See below for more details.
+  value. The default is `bridge` for all operating systems but Windows, which
+  defaults to `nat`. Other networking modes may not work without additional
+  configuration on the host (which is outside the scope of Nomad).  Valid values
+  pre-docker 1.9 are `default`, `bridge`, `host`, `none`, or `container:name`.
+  See below for more details.
 
 * `hostname` - (Optional) The hostname to assign to the container. When
   launching more than one of a task (using `count`) with this option set, every