Fixed bug where docker_container resource was not working properly with swarm

[josephholsten]

Just a rebase of: #1990

[josephholsten]

oh, there was a stray space causing a go vet error. fixed nao.

[peterbourgon]

Can has merge?

[tomwilkie]

I believe there was an error rebasing this, it be:

diff --git a/builtin/providers/docker/resource_docker_container_funcs.go b/builtin/providers/docker/resource_docker_container_funcs.go
index aa74a4e..45897cc 100644
--- a/builtin/providers/docker/resource_docker_container_funcs.go
+++ b/builtin/providers/docker/resource_docker_container_funcs.go
@@ -4,7 +4,6 @@ import (
        "errors"
        "fmt"
        "strconv"
-       "strings"
        "time"

        dc "github.com/fsouza/go-dockerclient"
@@ -123,7 +122,7 @@ func resourceDockerContainerCreate(d *schema.ResourceData, meta interface{}) err
 func resourceDockerContainerRead(d *schema.ResourceData, meta interface{}) error {
        client := meta.(*dc.Client)

-       apiContainer, err := fetchDockerContainer(d.Get("name").(string), client)
+       apiContainer, err := fetchDockerContainer(d.Id(), client)
        if err != nil {
                return err
        }
@@ -223,28 +222,15 @@ func stringSetToStringSlice(stringSet *schema.Set) []string {
        return ret
 }

-func fetchDockerContainer(name string, client *dc.Client) (*dc.APIContainers, error) {
+func fetchDockerContainer(ID string, client *dc.Client) (*dc.APIContainers, error) {
        apiContainers, err := client.ListContainers(dc.ListContainersOptions{All: true})
-
        if err != nil {
                return nil, fmt.Errorf("Error fetching container information from Docker: %s\n", err)
        }

        for _, apiContainer := range apiContainers {
-               // Sometimes the Docker API prefixes container names with /
-               // like it does in these commands. But if there's no
-               // set name, it just uses the ID without a /...ugh.
-               switch len(apiContainer.Names) {
-               case 0:
-                       if apiContainer.ID == name {
-                               return &apiContainer, nil
-                       }
-               default:
-                       for _, containerName := range apiContainer.Names {
-                               if strings.TrimLeft(containerName, "/") == name {
-                                       return &apiContainer, nil
-                               }
-                       }
+               if apiContainer.ID == ID {
+                       return &apiContainer, nil
                }
        }

[tomwilkie]

Above fix (and rebase) is here: https://github.com/tomwilkie/terraform/tree/swarm-fix

[jen20]

Looks good to me - we should merge this following #3761 (in order that we catch all the changes which need making). I'll come back to this tomorrow when the 0.6.8 release window is closed.

[jen20]

As @tomwilkie points out there was likely an issue rebasing here, I have manually applied the patch and opened up a new pull request at #4148. I'll go ahead and close this PR in favour of that one.

[ghost]

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.