Merge pull request #2143 from weaveworks/2142-wrong-compose-install-docs

Fix Scope arguments in Docker Compose installation docs
weaveworks · Jan 21, 2017 · a6e6131 · a6e6131
2 parents 7aff988 + 1c56b53
commit a6e6131
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/examples/docker/docker-compose-probe-v1.yml b/examples/docker/docker-compose-probe-v1.yml
@@ -8,7 +8,5 @@ probe:
   volumes:
     - "/var/run/docker.sock:/var/run/docker.sock:rw"
   command:
-    - "--probe.docker"
-    - "true"
-    - "--service-token"
-    - "${SCOPE_SERVICE_TOKEN}"
+    - "--probe.docker=true"
+    - "--service-token=${SCOPE_SERVICE_TOKEN}"
diff --git a/examples/docker/docker-compose-probe-v2.yml b/examples/docker/docker-compose-probe-v2.yml
@@ -10,7 +10,5 @@ services:
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:rw"
     command:
-      - "--probe.docker"
-      - "true"
-      - "--service-token"
-      - "${SCOPE_SERVICE_TOKEN}"
+      - "--probe.docker=true"
+      - "--service-token=${SCOPE_SERVICE_TOKEN}"
diff --git a/site/installing.md b/site/installing.md
@@ -130,8 +130,7 @@ After it’s been launched, open your browser to `http://localhost:4040`.
       volumes:
         - "/var/run/docker.sock:/var/run/docker.sock:rw"
       command:
-        - "--probe.docker"
-        - "true"
+        - "--probe.docker=true"
 
 **Docker Compose Format Version 2:**
 
@@ -147,8 +146,7 @@ After it’s been launched, open your browser to `http://localhost:4040`.
         volumes:
           - "/var/run/docker.sock:/var/run/docker.sock:rw"
         command:
-          - "--probe.docker"
-          - "true"
+          - "--probe.docker=true"
 
 Version 2 of this YAML file supports networks and volumes as defined by any plugins you might be using. See [Compose File Reference](https://docs.docker.com/compose/compose-file/) for more information.
 
@@ -180,10 +178,8 @@ After it’s been launched, open your web browser to [https://cloud.weave.works]
       volumes:
         - "/var/run/docker.sock:/var/run/docker.sock:rw"
       command:
-        - "--probe.docker"
-        - "true"
-        - "--service-token"
-        - "${SCOPE_SERVICE_TOKEN}"
+        - "--probe.docker=true"
+        - "--service-token=${SCOPE_SERVICE_TOKEN}"
 
 **Docker Compose Format Version 2:**
 
@@ -199,10 +195,8 @@ After it’s been launched, open your web browser to [https://cloud.weave.works]
         volumes:
           - "/var/run/docker.sock:/var/run/docker.sock:rw"
         command:
-          - "--probe.docker"
-          - "true"
-          - "--service-token"
-          - "${SCOPE_SERVICE_TOKEN}"
+          - "--probe.docker=true"
+          - "--service-token=${SCOPE_SERVICE_TOKEN}"
 
 Version 2 of this YAML file supports networks and volumes as defined by any plugins you might be using. See [Compose File Reference](https://docs.docker.com/compose/compose-file/) for more information.