From a638b360ae8062212a3d0ce1a217343c0612b786 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Mon, 12 Jan 2015 22:58:03 +0000 Subject: [PATCH] use tcp:// in doc and update copyrights Signed-off-by: Victor Vieux --- LICENSE | 2 +- README.md | 14 ++++++------- discovery/README.md | 50 ++++++++++++++++++++++----------------------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/LICENSE b/LICENSE index 27448585ad..9e4bd4dbee 100644 --- a/LICENSE +++ b/LICENSE @@ -176,7 +176,7 @@ END OF TERMS AND CONDITIONS - Copyright 2014 Docker, Inc. + Copyright 2014-2015 Docker, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index 9a6b31eb28..64a3683153 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ go get -u github.com/docker/swarm The only requirement for Swarm nodes is to run a regular Docker daemon (version `1.4.0` and later). In order for Swarm to be able to communicate with its nodes, they must bind on a network interface. -This can be achieved by starting Docker with the `-H` flag (e.g. `-H 0.0.0.0:2375`). +This can be achieved by starting Docker with the `-H` flag (e.g. `-H tcp://0.0.0.0:2375`). ### Example usage @@ -39,13 +39,13 @@ $ swarm create $ swarm join --discovery token:// --addr= # start the manager on any machine or your laptop -$ swarm manage --discovery token:// -H +$ swarm manage --discovery token:// -H tcp:// # use the regular docker cli -$ docker -H info -$ docker -H run ... -$ docker -H ps -$ docker -H logs ... +$ docker -H tcp:// info +$ docker -H tcp:// run ... +$ docker -H tcp:// ps +$ docker -H tcp:// logs ... ... # list nodes in your cluster @@ -91,5 +91,5 @@ We welcome pull requests and patches; come say hi on IRC, #docker-swarm on freen ## Copyright and license -Code and documentation copyright 2014 Docker, inc. Code released under the Apache 2.0 license. +Code and documentation copyright 2014-2015 Docker, inc. Code released under the Apache 2.0 license. Docs released under Creative commons. diff --git a/discovery/README.md b/discovery/README.md index 56f0d801e1..765738cc8e 100644 --- a/discovery/README.md +++ b/discovery/README.md @@ -18,13 +18,13 @@ $ swarm create $ swarm join --discovery token:// --addr= # start the manager on any machine or your laptop -$ swarm manage --discovery token:// -H +$ swarm manage --discovery token:// -H tcp:// # use the regular docker cli -$ docker -H info -$ docker -H run ... -$ docker -H ps -$ docker -H logs ... +$ docker -H tcp:// info +$ docker -H tcp:// run ... +$ docker -H tcp:// ps +$ docker -H tcp:// logs ... ... # list nodes in your cluster @@ -43,13 +43,13 @@ $ echo >> /tmp/my_cluster $ echo >> /tmp/my_cluster # start the manager on any machine or your laptop -$ swarm manage --discovery file:///tmp/my_cluster -H +$ swarm manage --discovery file:///tmp/my_cluster -H tcp:// # use the regular docker cli -$ docker -H info -$ docker -H run ... -$ docker -H ps -$ docker -H logs ... +$ docker -H tcp:// info +$ docker -H tcp:// run ... +$ docker -H tcp:// ps +$ docker -H tcp:// logs ... ... # list nodes in your cluster @@ -68,13 +68,13 @@ $ swarm list --discovery file:///tmp/my_cluster $ swarm join --discovery etcd:/// --addr= # start the manager on any machine or your laptop -$ swarm manage --discovery etcd:/// -H +$ swarm manage --discovery etcd:/// -H tcp:// # use the regular docker cli -$ docker -H info -$ docker -H run ... -$ docker -H ps -$ docker -H logs ... +$ docker -H tcp:// info +$ docker -H tcp:// run ... +$ docker -H tcp:// ps +$ docker -H tcp:// logs ... ... # list nodes in your cluster @@ -91,13 +91,13 @@ $ swarm list --discovery etcd:/// $ swarm join --discovery consul:/// --addr= # start the manager on any machine or your laptop -$ swarm manage --discovery consul:/// -H +$ swarm manage --discovery consul:/// -H tcp:// # use the regular docker cli -$ docker -H info -$ docker -H run ... -$ docker -H ps -$ docker -H logs ... +$ docker -H tcp:// info +$ docker -H tcp:// run ... +$ docker -H tcp:// ps +$ docker -H tcp:// logs ... ... # list nodes in your cluster @@ -114,13 +114,13 @@ $ swarm list --discovery consul:/// $ swarm join --discovery zk://,/ --addr= # start the manager on any machine or your laptop -$ swarm manage --discovery zk://,/ -H +$ swarm manage --discovery zk://,/ -H tcp:// # use the regular docker cli -$ docker -H info -$ docker -H run ... -$ docker -H ps -$ docker -H logs ... +$ docker -H tcp:// info +$ docker -H tcp:// run ... +$ docker -H tcp:// ps +$ docker -H tcp:// logs ... ... # list nodes in your cluster