Merge pull request #4475 from ColinHebert/docker_network_mode

provider/docker: Add network_mode support to docker
This commit is contained in:
James Nugent 2016-01-07 16:06:55 -08:00
commit 0955983655
4 changed files with 12 additions and 0 deletions

View File

@ -238,6 +238,12 @@ func resourceDockerContainer() *schema.Resource {
Optional: true,
ForceNew: true,
},
"network_mode": &schema.Schema{
Type: schema.TypeString,
Optional: true,
ForceNew: true,
},
},
}
}

View File

@ -136,6 +136,10 @@ func resourceDockerContainerCreate(d *schema.ResourceData, meta interface{}) err
hostConfig.LogConfig.Config = mapTypeMapValsToString(v.(map[string]interface{}))
}
if v, ok := d.GetOk("network_mode"); ok {
hostConfig.NetworkMode = v.(string)
}
createOpts.HostConfig = hostConfig
var retContainer *dc.Container

View File

@ -155,5 +155,6 @@ resource "docker_container" "foo" {
max-size = "10m"
max-file = 20
}
network_mode = "bridge"
}
`

View File

@ -68,6 +68,7 @@ The following arguments are supported:
Defaults to "json-file".
* `log_opts` - (Optional) Key/value pairs to use as options for the logging
driver.
* `network_mode` - (Optional) Network mode of the container.
<a id="ports"></a>
## Ports