Merge pull request #71 from allermedia/swarm-node

Include information about the swarm node a container is on.

Author: jwilder

GLOCKFILE

@@ -1,4 +1,4 @@
 github.com/BurntSushi/toml f87ce853111478914f0bcffa34d43a93643e6eda
 github.com/Sirupsen/logrus 6ebb4e7b3c24b9fef150d7693e728cb1ebadf1f5
-github.com/docker/docker 9d65017069ff12fbf0a6f078ccf91bce42fc8ffb
-github.com/fsouza/go-dockerclient 10d10d464f96231c61e16f2d1b7fca3152a7040f
+github.com/docker/docker 95dcb2748442fc1f59e8c2e010679e0aea3cef1c
+github.com/fsouza/go-dockerclient de7e7a55fa1ff99c88420e104e4966f9ad36c72d

docker-gen.go

@@ -61,6 +61,7 @@ type RuntimeContainer struct {
 	Image     DockerImage
 	Env       map[string]string
 	Volumes   map[string]Volume
+	Node      SwarmNode
 }
 
 type DockerImage struct {
@@ -69,6 +70,12 @@ type DockerImage struct {
 	Tag        string
 }
 
+type SwarmNode struct {
+	ID      string
+	Name    string
+	Address Address
+}
+
 func (i *DockerImage) String() string {
 	ret := i.Repository
 	if i.Registry != "" {

docker_client.go

@@ -125,6 +125,7 @@ func getContainers(client *docker.Client) ([]*RuntimeContainer, error) {
 			Addresses: []Address{},
 			Env:       make(map[string]string),
 			Volumes:   make(map[string]Volume),
+			Node:      SwarmNode{},
 		}
 		for k, v := range container.NetworkSettings.Ports {
 			address := Address{
@@ -146,6 +147,13 @@ func getContainers(client *docker.Client) ([]*RuntimeContainer, error) {
 				ReadWrite: container.VolumesRW[k],
 			}
 		}
+		if container.Node != nil {
+			runtimeContainer.Node.ID = container.Node.ID
+			runtimeContainer.Node.Name = container.Node.Name
+			runtimeContainer.Node.Address = Address{
+				IP: container.Node.IP,
+			}
+		}
 
 		runtimeContainer.Env = splitKeyValueSlice(container.Config.Env)
 		containers = append(containers, runtimeContainer)