docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Docs: Remove now deprecated `--discovery` flags. 

Fixes #351

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2015-02-02 18:08:31 -08:00
parent 9541022642
commit 2a592974a1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -45,7 +45,7 @@ $ swarm create
# on each of your nodes, start the swarm agent # on each of your nodes, start the swarm agent
# <node_ip> doesn't have to be public (eg. 192.168.0.X), # <node_ip> doesn't have to be public (eg. 192.168.0.X),
# as long as the swarm manager can access it. # as long as the swarm manager can access it.
$ swarm join --addr=<node_ip:2375> --discovery=token://<cluster_id> $ swarm join --addr=<node_ip:2375> token://<cluster_id>
# start the manager on any machine or your laptop # start the manager on any machine or your laptop
$ swarm manage -H tcp://<swarm_ip:swarm_port> token://<cluster_id> $ swarm manage -H tcp://<swarm_ip:swarm_port> token://<cluster_id>
@ -58,7 +58,7 @@ $ docker -H tcp://<swarm_ip:swarm_port> logs ...
... ...
# list nodes in your cluster # list nodes in your cluster
$ swarm list --discovery=token://<cluster_id> $ swarm list token://<cluster_id>
<node_ip:2375> <node_ip:2375>
``` ```

6
userguide.md
View File

@ -56,10 +56,10 @@ $ swarm create
# For each of your nodes, start a swarm agent # For each of your nodes, start a swarm agent
# the Docker daemon <node_ip> doesn't have to be public (eg. 192.168.0.X), # the Docker daemon <node_ip> doesn't have to be public (eg. 192.168.0.X),
# as long as the swarm manager can access it. # as long as the swarm manager can access it.
$ swarm join --addr=<node_ip:2375> --discovery token://<cluster_id> $ swarm join --addr=<node_ip:2375> token://<cluster_id>
# start the manager on any machine or your laptop # start the manager on any machine or your laptop
$ swarm manage -H tcp://<swarm_ip:swarm_port> --discovery token://<cluster_id> $ swarm manage -H tcp://<swarm_ip:swarm_port> token://<cluster_id>
# use the regular docker cli # use the regular docker cli
$ docker -H tcp://<swarm_ip:swarm_port> info $ docker -H tcp://<swarm_ip:swarm_port> info
@ -69,7 +69,7 @@ $ docker -H tcp://<swarm_ip:swarm_port> logs ...
... ...
# list nodes in your cluster # list nodes in your cluster
$ swarm list --discovery token://<cluster_id> $ swarm list token://<cluster_id>
<node_ip:2375> <node_ip:2375>
``` ```