From fd3ae2d607aaf5a89134b40ce1a2f9cbb9c335eb Mon Sep 17 00:00:00 2001 From: Colin Hebert Date: Sun, 31 Jan 2016 08:31:30 +1100 Subject: [PATCH 1/2] Catch potential custom network errors in docker --- .../providers/docker/resource_docker_container_funcs.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin/providers/docker/resource_docker_container_funcs.go b/builtin/providers/docker/resource_docker_container_funcs.go index 39d2c09f0..44cd07f33 100644 --- a/builtin/providers/docker/resource_docker_container_funcs.go +++ b/builtin/providers/docker/resource_docker_container_funcs.go @@ -162,8 +162,11 @@ func resourceDockerContainerCreate(d *schema.ResourceData, meta interface{}) err if v, ok := d.GetOk("networks"); ok { connectionOpts := dc.NetworkConnectionOptions{Container: retContainer.ID} - for _, network := range v.(*schema.Set).List() { - client.ConnectNetwork(network.(string), connectionOpts) + for _, rawNetwork := range v.(*schema.Set).List() { + network := rawNetwork.(string) + if err := client.ConnectNetwork(network), connectionOpts); err != nil { + return fmt.Errorf("Unable to connect to network '%s': %s", network, err) + } } } From d89c365838546107a2936ca0fa45d3d9b9a0072a Mon Sep 17 00:00:00 2001 From: Colin Hebert Date: Sun, 31 Jan 2016 08:49:35 +1100 Subject: [PATCH 2/2] remove extra parenthesis --- builtin/providers/docker/resource_docker_container_funcs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/providers/docker/resource_docker_container_funcs.go b/builtin/providers/docker/resource_docker_container_funcs.go index 44cd07f33..0f276b0f6 100644 --- a/builtin/providers/docker/resource_docker_container_funcs.go +++ b/builtin/providers/docker/resource_docker_container_funcs.go @@ -164,7 +164,7 @@ func resourceDockerContainerCreate(d *schema.ResourceData, meta interface{}) err for _, rawNetwork := range v.(*schema.Set).List() { network := rawNetwork.(string) - if err := client.ConnectNetwork(network), connectionOpts); err != nil { + if err := client.ConnectNetwork(network, connectionOpts); err != nil { return fmt.Errorf("Unable to connect to network '%s': %s", network, err) } }