From df41a808c23402001a0a13504669447556be6eaa Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Sat, 4 Mar 2017 11:22:00 +0000 Subject: [PATCH 1/2] parse probe-only flag as intended --- prog/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prog/main.go b/prog/main.go index 278a305b8..d361e8d70 100644 --- 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") From 0aec6feed05d15d63659603f2941f9b529a9d860 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Sat, 4 Mar 2017 11:32:14 +0000 Subject: [PATCH 2/2] consistency: --no-app is used elsewhere; --probe-only isn't --- docker/Dockerfile.cloud-agent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.cloud-agent b/docker/Dockerfile.cloud-agent index 4f5156973..7bcf8533d 100644 --- 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"]