github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 17:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't set the hostname in the scope container when running with weavedns.

Browse Source
This commit is contained in:
Tom Wilkie
2015-05-22 17:11:06 +00:00
parent f577bbc76f
commit 2c9a2da14f
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scope
View File

@@ -122,11 +122,10 @@ case "$COMMAND" in
check_not_running $CONTAINER_NAME $IMAGE
# If WeaveDNS is running, we want to automatically tell the scope
# image to use weave dns. We can't use --dns or --hostname
# with --net=host, so we have to hack it.
# image to use weave dns. We can't use --dns with --net=host, so we have to hack it.
if dns_running; then
docker_bridge_ip
WEAVESCOPE_DNS_ARGS="--dns $DOCKER_BRIDGE_IP --hostname $HOSTNAME --searchpath $DOMAINNAME"
WEAVESCOPE_DNS_ARGS="--dns $DOCKER_BRIDGE_IP --searchpath $DOMAINNAME"
fi
CONTAINER=$(docker run --privileged -d --name=$CONTAINER_NAME --net=host \