Merge branch 'md5-fix-env-split'

Author: jwilder

Makefile

@@ -1,7 +1,7 @@
 .SILENT :
 .PHONY : docker-gen clean fmt
 
-TAG:=`git describe --abbrev=0 --tags`
+TAG:=`git describe --tags`
 LDFLAGS:=-X main.buildVersion $(TAG)
 
 all: docker-gen
@@ -25,7 +25,7 @@ dist: dist-clean
 
 
 release: dist
-	glock sync github.com/jwilder/docker-gen
+	glock sync -n < GLOCKFILE
 	tar -cvzf docker-gen-linux-amd64-$(TAG).tar.gz -C dist/linux/amd64 docker-gen
 	tar -cvzf docker-gen-linux-i386-$(TAG).tar.gz -C dist/linux/i386 docker-gen
 	tar -cvzf docker-gen-linux-armel-$(TAG).tar.gz -C dist/linux/armel docker-gen

docker-gen.go

@@ -98,13 +98,7 @@ type ConfigFile struct {
 type Context []*RuntimeContainer
 
 func (c *Context) Env() map[string]string {
-
-	env := make(map[string]string)
-	for _, i := range os.Environ() {
-		parts := strings.Split(i, "=")
-		env[parts[0]] = parts[1]
-	}
-	return env
+	return splitKeyValueSlice(os.Environ())
 }
 
 func (c *ConfigFile) filterWatches() ConfigFile {

docker_client.go

@@ -147,11 +147,7 @@ func getContainers(client *docker.Client) ([]*RuntimeContainer, error) {
 			}
 		}
 
-		for _, entry := range container.Config.Env {
-			parts := strings.Split(entry, "=")
-			runtimeContainer.Env[parts[0]] = parts[1]
-		}
-
+		runtimeContainer.Env = splitKeyValueSlice(container.Config.Env)
 		containers = append(containers, runtimeContainer)
 	}
 	return containers, nil

utils.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"os"
+	"strings"
 )
 
 func getEndpoint() (string, error) {
@@ -21,3 +22,19 @@ func getEndpoint() (string, error) {
 
 	return defaultEndpoint, nil
 }
+
+// splitKeyValueSlice takes a string slice where values are of the form
+// KEY, KEY=, KEY=VALUE  or KEY=NESTED_KEY=VALUE2, and returns a map[string]string where items
+// are split at their first `=`.
+func splitKeyValueSlice(in []string) map[string]string {
+	env := make(map[string]string)
+	for _, entry := range in {
+		parts := strings.SplitN(entry, "=", 2)
+		if len(parts) != 2 {
+			parts = append(parts, "")
+		}
+		env[parts[0]] = parts[1]
+	}
+	return env
+
+}

utils_test.go

@@ -62,3 +62,23 @@ func TestUnixBadFormat(t *testing.T) {
 		t.Fatal("endpoint should have failed")
 	}
 }
+
+func TestSplitKeyValueSlice(t *testing.T) {
+	tests := []struct {
+		input    []string
+		expected string
+	}{
+		{[]string{"K"}, ""},
+		{[]string{"K="}, ""},
+		{[]string{"K=V3"}, "V3"},
+		{[]string{"K=V4=V5"}, "V4=V5"},
+	}
+
+	for _, i := range tests {
+		v := splitKeyValueSlice(i.input)
+		if v["K"] != i.expected {
+			t.Fatalf("expected K='%s'. got '%s'", i.expected, v["K"])
+		}
+
+	}
+}