From 7e51862b324a79a7be1126fc73fdce55a347b7f5 Mon Sep 17 00:00:00 2001
From: pidster <pid@pidster.com>
Date: Tue, 8 Mar 2016 17:06:13 +0000
Subject: [PATCH] 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=<token>
 
 ## <a name="launching-weave-scope-and-compose-in-cloud-service-mode"></a>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}" 
 
 ## <a name="using-weave-scope-with-kubernetes"></a>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}"