Merge pull request #82 from appropriate/add-label-support

jwilder · jwilder · commit 243cb0d6cf55 · 2015-05-03T23:04:19.000-06:00
Expose RuntimeContainer.Labels
diff --git a/GLOCKFILE b/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 de7e7a55fa1ff99c88420e104e4966f9ad36c72d
+github.com/fsouza/go-dockerclient 1e60afa8d58b91a0eca0a732927c8ecba696493f
diff --git a/docker-gen.go b/docker-gen.go
@@ -62,6 +62,7 @@ type RuntimeContainer struct {
 	Env       map[string]string
 	Volumes   map[string]Volume
 	Node      SwarmNode
+	Labels    map[string]string
 }
 
 type DockerImage struct {
diff --git a/docker_client.go b/docker_client.go
@@ -126,6 +126,7 @@ func getContainers(client *docker.Client) ([]*RuntimeContainer, error) {
 			Env:       make(map[string]string),
 			Volumes:   make(map[string]Volume),
 			Node:      SwarmNode{},
+			Labels:    make(map[string]string),
 		}
 		for k, v := range container.NetworkSettings.Ports {
 			address := Address{
@@ -156,6 +157,7 @@ func getContainers(client *docker.Client) ([]*RuntimeContainer, error) {
 		}
 
 		runtimeContainer.Env = splitKeyValueSlice(container.Config.Env)
+		runtimeContainer.Labels = container.Config.Labels
 		containers = append(containers, runtimeContainer)
 	}
 	return containers, nil

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ type RuntimeContainer struct {`
`62`	`62`	`Env map[string]string`
`63`	`63`	`Volumes map[string]Volume`
`64`	`64`	`Node SwarmNode`
	`65`	`+ Labels map[string]string`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`type DockerImage struct {`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ func getContainers(client docker.Client) ([]RuntimeContainer, error) {`
`126`	`126`	`Env: make(map[string]string),`
`127`	`127`	`Volumes: make(map[string]Volume),`
`128`	`128`	`Node: SwarmNode{},`
	`129`	`+ Labels: make(map[string]string),`
`129`	`130`	`}`
`130`	`131`	`for k, v := range container.NetworkSettings.Ports {`
`131`	`132`	`address := Address{`
`@@ -156,6 +157,7 @@ func getContainers(client docker.Client) ([]RuntimeContainer, error) {`
`156`	`157`	`}`
`157`	`158`
`158`	`159`	`runtimeContainer.Env = splitKeyValueSlice(container.Config.Env)`
	`160`	`+ runtimeContainer.Labels = container.Config.Labels`
`159`	`161`	`containers = append(containers, runtimeContainer)`
`160`	`162`	`}`
`161`	`163`	`return containers, nil`