Merge pull request #227 from ashmckenzie/amckenzie/missing-protocol-fix

Missing protocol fix

Author: progrium

Makefile

@@ -1,11 +1,12 @@
 NAME=registrator
 VERSION=$(shell cat VERSION)
+DEV_RUN_OPTS ?= consul:
 
 dev:
 	docker build -f Dockerfile.dev -t $(NAME):dev .
 	docker run --rm \
 		-v /var/run/docker.sock:/tmp/docker.sock \
-		$(NAME):dev /bin/registrator consul:
+		$(NAME):dev /bin/registrator $(DEV_RUN_OPTS)
 
 build:
 	mkdir -p build

bridge/util.go

@@ -56,21 +56,27 @@ func serviceMetaData(config *dockerapi.Config, port string) map[string]string {
 }
 
 func servicePort(container *dockerapi.Container, port dockerapi.Port, published []dockerapi.PortBinding) ServicePort {
-	var hp, hip string
+	var hp, hip, ep, ept string
 	if len(published) > 0 {
 		hp = published[0].HostPort
 		hip = published[0].HostIP
 	}
 	if hip == "" {
 		hip = "0.0.0.0"
 	}
-	p := strings.Split(string(port), "/")
+	exposedPort := strings.Split(string(port), "/")
+	ep = exposedPort[0]
+	if len(exposedPort) == 2 {
+		ept = exposedPort[1]
+	} else {
+		ept = "tcp"  // default
+	}
 	return ServicePort{
 		HostPort:          hp,
 		HostIP:            hip,
-		ExposedPort:       p[0],
+		ExposedPort:       ep,
 		ExposedIP:         container.NetworkSettings.IPAddress,
-		PortType:          p[1],
+		PortType:          ept,
 		ContainerID:       container.ID,
 		ContainerHostname: container.Config.Hostname,
 		container:         container,