From 80d0fc1cb9083f9e417c2015a468d6f5c8f6e953 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Fri, 20 Jan 2017 13:43:10 +0000 Subject: [PATCH 1/2] Fix Scope arguments in Docker Compose installation docs --- site/installing.md | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/site/installing.md b/site/installing.md index e22c6c761..539e7982e 100644 --- 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. From 1c56b536a31171003902d0001fbdd496e1e125e4 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Fri, 20 Jan 2017 14:41:13 +0000 Subject: [PATCH 2/2] Fix examples too --- examples/docker/docker-compose-probe-v1.yml | 6 ++---- examples/docker/docker-compose-probe-v2.yml | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/examples/docker/docker-compose-probe-v1.yml b/examples/docker/docker-compose-probe-v1.yml index cec511634..66c8d7151 100644 --- 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 index 0b66ae69b..6cc01f52f 100644 --- 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}"