ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1564 from nickryand/docker_links 

Added Docker links support to the docker_container resource.
This commit is contained in:
Mitchell Hashimoto 2015-04-18 16:41:17 -07:00
parent ff22e514ca f74405d5e7
commit 2acc9b2e44
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/providers/docker/resource_docker_container.go
View File

@ -108,6 +108,14 @@ func resourceDockerContainer() *schema.Resource {
Elem: &schema.Schema{Type: schema.TypeString}, Elem: &schema.Schema{Type: schema.TypeString},
Set: stringSetHash, Set: stringSetHash,
}, },
"links": &schema.Schema{
Type: schema.TypeSet,
Optional: true,
ForceNew: true,
Elem: &schema.Schema{Type: schema.TypeString},
Set: stringSetHash,
},
}, },
} }
} }

4
builtin/providers/docker/resource_docker_container_funcs.go
View File

@ -103,6 +103,10 @@ func resourceDockerContainerCreate(d *schema.ResourceData, meta interface{}) err
hostConfig.DNS = stringSetToStringSlice(v.(*schema.Set)) hostConfig.DNS = stringSetToStringSlice(v.(*schema.Set))
} }
if v, ok := d.GetOk("links"); ok {
hostConfig.Links = stringSetToStringSlice(v.(*schema.Set))
}
if err := client.StartContainer(retContainer.ID, hostConfig); err != nil { if err := client.StartContainer(retContainer.ID, hostConfig); err != nil {
return fmt.Errorf("Unable to start container: %s", err) return fmt.Errorf("Unable to start container: %s", err)
} }

2
website/source/docs/providers/docker/r/container.html.markdown
View File

@ -38,6 +38,8 @@ The following arguments are supported:
container. container.
* `dns` - (Optional, set of strings) Set of DNS servers. * `dns` - (Optional, set of strings) Set of DNS servers.
* `env` - (Optional, set of strings) Environmental variables to set. * `env` - (Optional, set of strings) Environmental variables to set.
* `links` - (Optional, set of strings) Set of links for link based
connectivity between containers that are running on the same host.
* `hostname` - (Optional, string) Hostname of the container. * `hostname` - (Optional, string) Hostname of the container.
* `domainname` - (Optional, string) Domain name of the container. * `domainname` - (Optional, string) Domain name of the container.
* `must_run` - (Optional, bool) If true, then the Docker container will be * `must_run` - (Optional, bool) If true, then the Docker container will be