Merge pull request #31 from mattmcclean/master

progrium · progrium · commit 4e79c6e65b00 · 2016-01-27T09:47:18.000-06:00
Updated Docker label format to be docker spec compliant
diff --git a/README.md b/README.md
@@ -37,13 +37,13 @@ With Resolvable running, it will have access to Consul DNS. It will be able to r
 
 All you have to do is specify a port to use and what you'd like to connect to as a label. For example:
 
-	connect[6000]=redis.service.consul
+	connect.6000=redis.service.consul
 
 With this label set, you can connect to Redis on localhost:6000. You can also specify multiple services:
 
 	$ docker run -d --name myservice \
-			-l connect[6000]=redis.service.consul \
-			-l connect[3306]=master.mysql.service.consul \
+			-l connect.6000=redis.service.consul \
+			-l connect.3306=master.mysql.service.consul \
 			example/myservice
 
 ## Load Balancing
diff --git a/connectable.go b/connectable.go
@@ -88,7 +88,7 @@ func inspectBackend(sourceIP, destPort string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	label := fmt.Sprintf("connect[%s]", destPort)
+	label := fmt.Sprintf("connect.%s", destPort)
 
 	// todo: cache, invalidate with container destroy events
 	containers, err := client.ListContainers(docker.ListContainersOptions{})

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func inspectBackend(sourceIP, destPort string) (string, error) {`
`88`	`88`	`if err != nil {`
`89`	`89`	`return "", err`
`90`	`90`	`}`
`91`		`- label := fmt.Sprintf("connect[%s]", destPort)`
	`91`	`+ label := fmt.Sprintf("connect.%s", destPort)`
`92`	`92`
`93`	`93`	`// todo: cache, invalidate with container destroy events`
`94`	`94`	`containers, err := client.ListContainers(docker.ListContainersOptions{})`