Merge pull request #144 from dustinblackman/add-networks

Add support for NetworkSettings.Networks

Author: jwilder

GLOCKFILE

@@ -1,4 +1,4 @@
 github.com/BurntSushi/toml f87ce853111478914f0bcffa34d43a93643e6eda
 github.com/Sirupsen/logrus 6ebb4e7b3c24b9fef150d7693e728cb1ebadf1f5
 github.com/docker/docker 2606a2e4d3bf810ec82e373a6cd334e22e504e83
-github.com/fsouza/go-dockerclient 1399676f53e6ccf46e0bf00751b21bed329bc60e
+github.com/fsouza/go-dockerclient 54afc1babbc57f075f958f84904251332bd8fd73

docker-gen.go

@@ -55,6 +55,18 @@ type Address struct {
 	HostIP       string
 }
 
+type Network struct {
+	IP                  string
+	Name                string
+	Gateway             string
+	EndpointID          string
+	IPv6Gateway         string
+	GlobalIPv6Address   string
+	MacAddress          string
+	GlobalIPv6PrefixLen int
+	IPPrefixLen         int
+}
+
 type Volume struct {
 	Path      string
 	HostPath  string
@@ -64,6 +76,7 @@ type Volume struct {
 type RuntimeContainer struct {
 	ID           string
 	Addresses    []Address
+	Networks     []Network
 	Gateway      string
 	Name         string
 	Hostname     string

docker_client.go

@@ -124,6 +124,7 @@ func getContainers(client *docker.Client) ([]*RuntimeContainer, error) {
 			Hostname:     container.Config.Hostname,
 			Gateway:      container.NetworkSettings.Gateway,
 			Addresses:    []Address{},
+			Networks:     []Network{},
 			Env:          make(map[string]string),
 			Volumes:      make(map[string]Volume),
 			Node:         SwarmNode{},
@@ -148,6 +149,22 @@ func getContainers(client *docker.Client) ([]*RuntimeContainer, error) {
 				address)
 
 		}
+		for k, v := range container.NetworkSettings.Networks {
+			network := Network{
+				IP:                  v.IPAddress,
+				Name:                k,
+				Gateway:             v.Gateway,
+				EndpointID:          v.EndpointID,
+				IPv6Gateway:         v.IPv6Gateway,
+				GlobalIPv6Address:   v.GlobalIPv6Address,
+				MacAddress:          v.MacAddress,
+				GlobalIPv6PrefixLen: v.GlobalIPv6PrefixLen,
+				IPPrefixLen:         v.IPPrefixLen,
+			}
+
+			runtimeContainer.Networks = append(runtimeContainer.Networks,
+				network)
+		}
 		for k, v := range container.Volumes {
 			runtimeContainer.Volumes[k] = Volume{
 				Path:      k,