added ipv6 support

Author: lukas2511

GLOCKFILE

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

docker-gen.go

@@ -46,11 +46,13 @@ type Event struct {
 }
 
 type Address struct {
-	IP       string
-	Port     string
-	HostPort string
-	Proto    string
-	HostIP   string
+	IP            string
+	IP6_LinkLocal string
+	IP6_Global    string
+	Port          string
+	HostPort      string
+	Proto         string
+	HostIP        string
 }
 
 type Volume struct {
@@ -60,17 +62,19 @@ type Volume struct {
 }
 
 type RuntimeContainer struct {
-	ID        string
-	Addresses []Address
-	Gateway   string
-	Name      string
-	Hostname  string
-	Image     DockerImage
-	Env       map[string]string
-	Volumes   map[string]Volume
-	Node      SwarmNode
-	Labels    map[string]string
-	IP        string
+	ID            string
+	Addresses     []Address
+	Gateway       string
+	Name          string
+	Hostname      string
+	Image         DockerImage
+	Env           map[string]string
+	Volumes       map[string]Volume
+	Node          SwarmNode
+	Labels        map[string]string
+	IP            string
+	IP6_LinkLocal string
+	IP6_Global    string
 }
 
 type DockerImage struct {

docker_client.go

@@ -129,10 +129,14 @@ func getContainers(client *docker.Client) ([]*RuntimeContainer, error) {
 			Node:      SwarmNode{},
 			Labels:    make(map[string]string),
 			IP:        container.NetworkSettings.IPAddress,
+			IP6_LinkLocal:        container.NetworkSettings.LinkLocalIPv6Address,
+			IP6_Global:        container.NetworkSettings.GlobalIPv6Address,
 		}
 		for k, v := range container.NetworkSettings.Ports {
 			address := Address{
 				IP:    container.NetworkSettings.IPAddress,
+				IP6_LinkLocal:        container.NetworkSettings.LinkLocalIPv6Address,
+				IP6_Global:        container.NetworkSettings.GlobalIPv6Address,
 				Port:  k.Port(),
 				Proto: k.Proto(),
 			}