chore(*): Rename PUBLISH to EXTERNAL_PORT

This makes the boot logic more understandable. This commit also fixes
some wrong comments, about what is published and what is checked.

Author: johanneswuerbach

bin/boot

@@ -72,22 +72,22 @@ CONFD_PID=$!
 
 echo deis-controller running...
 
-# publish the service to etcd using the injected PORT
-if [[ ! -z $PUBLISH ]]; then
+# publish the service to etcd using the injected EXTERNAL_PORT
+if [[ ! -z $EXTERNAL_PORT ]]; then
 
 	# configure service discovery
 	PORT=${PORT:-8000}
 	PROTO=${PROTO:-tcp}
 
 	set +e
 
-	# wait for the service to become available on PUBLISH port
+	# wait for the service to become available on PORT
 	sleep 1 && while [[ -z $(netstat -lnt | awk "\$6 == \"LISTEN\" && \$4 ~ \".$PORT\" && \$1 ~ \"$PROTO.?\"") ]] ; do sleep 1; done
 
 	# while the port is listening, publish to etcd
 	while [[ ! -z $(netstat -lnt | awk "\$6 == \"LISTEN\" && \$4 ~ \".$PORT\" && \$1 ~ \"$PROTO.?\"") ]] ; do
 		etcdctl --no-sync -C $ETCD set $ETCD_PATH/host $HOST --ttl $ETCD_TTL >/dev/null
-		etcdctl --no-sync -C $ETCD set $ETCD_PATH/port $PUBLISH --ttl $ETCD_TTL >/dev/null
+		etcdctl --no-sync -C $ETCD set $ETCD_PATH/port $EXTERNAL_PORT --ttl $ETCD_TTL >/dev/null
 		sleep $(($ETCD_TTL/2)) # sleep for half the TTL
 	done
 

tests/controller_test.go

@@ -46,7 +46,7 @@ func TestController(t *testing.T) {
 			"--name", name,
 			"--rm",
 			"-p", port+":8000",
-			"-e", "PUBLISH="+port,
+			"-e", "EXTERNAL_PORT="+port,
 			"-e", "HOST="+host,
 			"-e", "ETCD_PORT="+etcdPort,
 			"deis/controller:"+tag)