From 930727f25274cc799be8125d32689958aec13e4a Mon Sep 17 00:00:00 2001 From: pidster Date: Tue, 8 Mar 2016 16:43:04 +0000 Subject: [PATCH 1/3] Example starting Scope probe with Docker Compose. --- README.md | 41 ++++++++++++++++++++++++++- examples/docker/docker-compose-v1.yml | 14 +++++++++ examples/docker/docker-compose-v2.yml | 16 +++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 examples/docker/docker-compose-v1.yml create mode 100644 examples/docker/docker-compose-v2.yml diff --git a/README.md b/README.md index 79a2ff4be..5341a70a4 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ boot2docker, replace localhost with the output of `boot2docker ip`.) If you have any questions about, feedback for or problem with Scope we invite you to: -- join our public slack channel +- join our public slack channel - send an email to weave-users@weave.works - file an issue @@ -169,6 +169,45 @@ sudo scope launch --service-token= +-----------------------+ +-----------------------+ ``` +## Launching Weave Scope and Docker Compose in Cloud Service Mode + +In both blocks below, replace MY_SCOPE_SERVICE_TOKEN with the token you find when you [log in to the Scope service](https://scope.weave.works/). + +### Docker Compose format version 2: + + version: '2' + services: + probe: + image: weaveworks/scope:0.13.1 + network_mode: "host" + pid: "host" + privileged: true + labels: + - "works.weave.role=system" + volumes: + - "/var/run/docker.sock:/var/run/docker.sock:rw" + command: + - "--probe.docker" + - "true" + - "--service-token" + - "MY_SCOPE_SERVICE_TOKEN" + +### Docker Compose format version 1: + + probe: + image: weaveworks/scope:0.13.1 + net: "host" + pid: "host" + privileged: true + labels: + - "works.weave.role=system" + volumes: + - "/var/run/docker.sock:/var/run/docker.sock:rw" + command: + - "--probe.docker" + - "true" + - "--service-token" + - "MY_SCOPE_SERVICE_TOKEN" ## Using Weave Scope with Kubernetes diff --git a/examples/docker/docker-compose-v1.yml b/examples/docker/docker-compose-v1.yml new file mode 100644 index 000000000..cead93b2b --- /dev/null +++ b/examples/docker/docker-compose-v1.yml @@ -0,0 +1,14 @@ +probe: + image: weaveworks/scope:0.13.1 + net: "host" + pid: "host" + privileged: true + labels: + - "works.weave.role=system" + volumes: + - "/var/run/docker.sock:/var/run/docker.sock:rw" + command: + - "--probe.docker" + - "true" + - "--service-token" + - "MY_SCOPE_SERVICE_TOKEN" \ No newline at end of file diff --git a/examples/docker/docker-compose-v2.yml b/examples/docker/docker-compose-v2.yml new file mode 100644 index 000000000..8123a1dac --- /dev/null +++ b/examples/docker/docker-compose-v2.yml @@ -0,0 +1,16 @@ +version: '2' +services: + probe: + image: weaveworks/scope:0.13.1 + network_mode: "host" + pid: "host" + privileged: true + labels: + - "works.weave.role=system" + volumes: + - "/var/run/docker.sock:/var/run/docker.sock:rw" + command: + - "--probe.docker" + - "true" + - "--service-token" + - "MY_SCOPE_SERVICE_TOKEN" \ No newline at end of file From 911eac2e2662530d54de16431ece4abef4cc0162 Mon Sep 17 00:00:00 2001 From: pidster Date: Tue, 8 Mar 2016 16:46:10 +0000 Subject: [PATCH 2/3] Rename example files --- .../docker/{docker-compose-v1.yml => docker-compose-probe-v1.yml} | 0 .../docker/{docker-compose-v2.yml => docker-compose-probe-v2.yml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename examples/docker/{docker-compose-v1.yml => docker-compose-probe-v1.yml} (100%) rename examples/docker/{docker-compose-v2.yml => docker-compose-probe-v2.yml} (100%) diff --git a/examples/docker/docker-compose-v1.yml b/examples/docker/docker-compose-probe-v1.yml similarity index 100% rename from examples/docker/docker-compose-v1.yml rename to examples/docker/docker-compose-probe-v1.yml diff --git a/examples/docker/docker-compose-v2.yml b/examples/docker/docker-compose-probe-v2.yml similarity index 100% rename from examples/docker/docker-compose-v2.yml rename to examples/docker/docker-compose-probe-v2.yml From 7e51862b324a79a7be1126fc73fdce55a347b7f5 Mon Sep 17 00:00:00 2001 From: pidster Date: Tue, 8 Mar 2016 17:06:13 +0000 Subject: [PATCH 3/3] Improvements to the compose file examples, using variables --- README.md | 8 +++++--- examples/docker/docker-compose-probe-v1.yml | 2 +- examples/docker/docker-compose-probe-v2.yml | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5341a70a4..1860ddeb2 100644 --- a/README.md +++ b/README.md @@ -171,7 +171,9 @@ sudo scope launch --service-token= ## Launching Weave Scope and Docker Compose in Cloud Service Mode -In both blocks below, replace MY_SCOPE_SERVICE_TOKEN with the token you find when you [log in to the Scope service](https://scope.weave.works/). +The SCOPE_SERVICE_TOKEN is found when you [log in to the Scope service](https://scope.weave.works/) - launch Docker Compose with one of the two fragments below and the value of the token set as an environment variable: + + SCOPE_SERVICE_TOKEN=abcdef_my_token docker-compose up -d ### Docker Compose format version 2: @@ -190,7 +192,7 @@ In both blocks below, replace MY_SCOPE_SERVICE_TOKEN with the token you find whe - "--probe.docker" - "true" - "--service-token" - - "MY_SCOPE_SERVICE_TOKEN" + - "${SCOPE_SERVICE_TOKEN}" ### Docker Compose format version 1: @@ -207,7 +209,7 @@ In both blocks below, replace MY_SCOPE_SERVICE_TOKEN with the token you find whe - "--probe.docker" - "true" - "--service-token" - - "MY_SCOPE_SERVICE_TOKEN" + - "${SCOPE_SERVICE_TOKEN}" ## Using Weave Scope with Kubernetes diff --git a/examples/docker/docker-compose-probe-v1.yml b/examples/docker/docker-compose-probe-v1.yml index cead93b2b..cec511634 100644 --- a/examples/docker/docker-compose-probe-v1.yml +++ b/examples/docker/docker-compose-probe-v1.yml @@ -11,4 +11,4 @@ probe: - "--probe.docker" - "true" - "--service-token" - - "MY_SCOPE_SERVICE_TOKEN" \ No newline at end of file + - "${SCOPE_SERVICE_TOKEN}" diff --git a/examples/docker/docker-compose-probe-v2.yml b/examples/docker/docker-compose-probe-v2.yml index 8123a1dac..0b66ae69b 100644 --- a/examples/docker/docker-compose-probe-v2.yml +++ b/examples/docker/docker-compose-probe-v2.yml @@ -13,4 +13,4 @@ services: - "--probe.docker" - "true" - "--service-token" - - "MY_SCOPE_SERVICE_TOKEN" \ No newline at end of file + - "${SCOPE_SERVICE_TOKEN}"