Don't just advertise addresses on eth devices; use hostname -I.

weaveworks · Jun 1, 2015 · 3d2521d · 3d2521d
1 parent 2e8df4a
commit 3d2521d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/scope b/scope
@@ -133,8 +133,11 @@ case "$COMMAND" in
 			$WEAVESCOPE_DOCKER_ARGS $SCOPE_IMAGE $WEAVESCOPE_DNS_ARGS "$@")
 
 		if dns_running; then
-			IP_ADDRS=$(find /sys/class/net -name eth* | xargs -n1 basename | xargs -n1 ip addr show |
-				grep inet | awk '{ print $2 }' | grep -oE "$IP_REGEXP" | xargs echo)
+			IP_ADDRS=$(hostname -I)
+			if [ -z "$IP_ADDRS" ]; then
+				echo "Could not determine local IP address; Weave DNS integration will not work correctly."
+				exit 1
+			fi
 			tell_dns_fqdn PUT $CONTAINER $FQDN $IP_ADDRS
 		fi