Merge pull request #2300 from weaveworks/2299-probe-only

parse --probe-only as intended Fixes #2299.
weaveworks · Mar 5, 2017 · 6bba59c · 6bba59c
2 parents 32550f6 + 0aec6fe
commit 6bba59c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docker/Dockerfile.cloud-agent b/docker/Dockerfile.cloud-agent
@@ -7,4 +7,4 @@ RUN apk add --update bash conntrack-tools iproute2 util-linux curl && \
 ADD ./docker /usr/local/bin/
 ADD ./weave ./weaveutil /usr/bin/
 COPY ./scope /home/weave/
-ENTRYPOINT ["/home/weave/scope", "--mode=probe", "--probe-only", "--probe.docker=true"]
+ENTRYPOINT ["/home/weave/scope", "--mode=probe", "--no-app", "--probe.docker=true"]
diff --git a/prog/main.go b/prog/main.go
@@ -254,9 +254,9 @@ func main() {
 	// They are also here so they are included in usage, and the probe uses them to decide if to
 	// publish to localhost.
 	noApp := flag.Bool("no-app", false, "Don't run the app.")
-	probeOnly := flag.Bool("app-only", false, "Only run the app")
-	flag.Bool("probe-only", false, "Only run the probe.")
+	probeOnly := flag.Bool("probe-only", false, "Only run the app.")
 	flag.Bool("no-probe", false, "Don't run the probe.")
+	flag.Bool("app-only", false, "Only run the probe.")
 
 	// Probe flags
 	flag.StringVar(&flags.probe.token, serviceTokenFlag, "", "Token to use to authenticate with cloud.weave.works")