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

Merge pull request #237 from vieux/use_tcp_doc 

use tcp:// in doc and update copyrights
This commit is contained in:
Andrea Luzzardi 2015-01-13 14:04:12 +01:00
parent 1e678662a2 a638b360ae
commit 336c1e265e
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -176,7 +176,7 @@
END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS
Copyright 2014 Docker, Inc. Copyright 2014-2015 Docker, Inc.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.

14
README.md
View File

@ -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). 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. 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 ### Example usage
@ -39,13 +39,13 @@ $ swarm create
$ swarm join --discovery token://<cluster_id> --addr=<node_ip:2375> $ swarm join --discovery token://<cluster_id> --addr=<node_ip:2375>
# start the manager on any machine or your laptop # start the manager on any machine or your laptop
$ swarm manage --discovery token://<cluster_id> -H <swarm_ip:swarm_port> $ swarm manage --discovery token://<cluster_id> -H tcp://<swarm_ip:swarm_port>
# use the regular docker cli # use the regular docker cli
$ docker -H <swarm_ip:swarm_port> info $ docker -H tcp://<swarm_ip:swarm_port> info
$ docker -H <swarm_ip:swarm_port> run ... $ docker -H tcp://<swarm_ip:swarm_port> run ...
$ docker -H <swarm_ip:swarm_port> ps $ docker -H tcp://<swarm_ip:swarm_port> ps
$ docker -H <swarm_ip:swarm_port> logs ... $ docker -H tcp://<swarm_ip:swarm_port> logs ...
... ...
# list nodes in your cluster # 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 ## 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. Docs released under Creative commons.

50
discovery/README.md
View File

@ -18,13 +18,13 @@ $ swarm create
$ swarm join --discovery token://<cluster_id> --addr=<node_ip:2375> $ swarm join --discovery token://<cluster_id> --addr=<node_ip:2375>
# start the manager on any machine or your laptop # start the manager on any machine or your laptop
$ swarm manage --discovery token://<cluster_id> -H <swarm_ip:swarm_port> $ swarm manage --discovery token://<cluster_id> -H tcp://<swarm_ip:swarm_port>
# use the regular docker cli # use the regular docker cli
$ docker -H <swarm_ip:swarm_port> info $ docker -H tcp://<swarm_ip:swarm_port> info
$ docker -H <swarm_ip:swarm_port> run ... $ docker -H tcp://<swarm_ip:swarm_port> run ...
$ docker -H <swarm_ip:swarm_port> ps $ docker -H tcp://<swarm_ip:swarm_port> ps
$ docker -H <swarm_ip:swarm_port> logs ... $ docker -H tcp://<swarm_ip:swarm_port> logs ...
... ...
# list nodes in your cluster # list nodes in your cluster
@ -43,13 +43,13 @@ $ echo <node_ip2:2375> >> /tmp/my_cluster
$ echo <node_ip3:2375> >> /tmp/my_cluster $ echo <node_ip3:2375> >> /tmp/my_cluster
# start the manager on any machine or your laptop # start the manager on any machine or your laptop
$ swarm manage --discovery file:///tmp/my_cluster -H <swarm_ip:swarm_port> $ swarm manage --discovery file:///tmp/my_cluster -H tcp://<swarm_ip:swarm_port>
# use the regular docker cli # use the regular docker cli
$ docker -H <swarm_ip:swarm_port> info $ docker -H tcp://<swarm_ip:swarm_port> info
$ docker -H <swarm_ip:swarm_port> run ... $ docker -H tcp://<swarm_ip:swarm_port> run ...
$ docker -H <swarm_ip:swarm_port> ps $ docker -H tcp://<swarm_ip:swarm_port> ps
$ docker -H <swarm_ip:swarm_port> logs ... $ docker -H tcp://<swarm_ip:swarm_port> logs ...
... ...
# list nodes in your cluster # list nodes in your cluster
@ -68,13 +68,13 @@ $ swarm list --discovery file:///tmp/my_cluster
$ swarm join --discovery etcd://<etcd_ip>/<path> --addr=<node_ip:2375> $ swarm join --discovery etcd://<etcd_ip>/<path> --addr=<node_ip:2375>
# start the manager on any machine or your laptop # start the manager on any machine or your laptop
$ swarm manage --discovery etcd://<etcd_ip>/<path> -H <swarm_ip:swarm_port> $ swarm manage --discovery etcd://<etcd_ip>/<path> -H tcp://<swarm_ip:swarm_port>
# use the regular docker cli # use the regular docker cli
$ docker -H <swarm_ip:swarm_port> info $ docker -H tcp://<swarm_ip:swarm_port> info
$ docker -H <swarm_ip:swarm_port> run ... $ docker -H tcp://<swarm_ip:swarm_port> run ...
$ docker -H <swarm_ip:swarm_port> ps $ docker -H tcp://<swarm_ip:swarm_port> ps
$ docker -H <swarm_ip:swarm_port> logs ... $ docker -H tcp://<swarm_ip:swarm_port> logs ...
... ...
# list nodes in your cluster # list nodes in your cluster
@ -91,13 +91,13 @@ $ swarm list --discovery etcd://<etcd_ip>/<path>
$ swarm join --discovery consul://<consul_addr>/<path> --addr=<node_ip:2375> $ swarm join --discovery consul://<consul_addr>/<path> --addr=<node_ip:2375>
# start the manager on any machine or your laptop # start the manager on any machine or your laptop
$ swarm manage --discovery consul://<consul_addr>/<path> -H <swarm_ip:swarm_port> $ swarm manage --discovery consul://<consul_addr>/<path> -H tcp://<swarm_ip:swarm_port>
# use the regular docker cli # use the regular docker cli
$ docker -H <swarm_ip:swarm_port> info $ docker -H tcp://<swarm_ip:swarm_port> info
$ docker -H <swarm_ip:swarm_port> run ... $ docker -H tcp://<swarm_ip:swarm_port> run ...
$ docker -H <swarm_ip:swarm_port> ps $ docker -H tcp://<swarm_ip:swarm_port> ps
$ docker -H <swarm_ip:swarm_port> logs ... $ docker -H tcp://<swarm_ip:swarm_port> logs ...
... ...
# list nodes in your cluster # list nodes in your cluster
@ -114,13 +114,13 @@ $ swarm list --discovery consul://<consul_addr>/<path>
$ swarm join --discovery zk://<zookeeper_addr1>,<zookeeper_addr2>/<path> --addr=<node_ip:2375> $ swarm join --discovery zk://<zookeeper_addr1>,<zookeeper_addr2>/<path> --addr=<node_ip:2375>
# start the manager on any machine or your laptop # start the manager on any machine or your laptop
$ swarm manage --discovery zk://<zookeeper_addr1>,<zookeeper_addr2>/<path> -H <swarm_ip:swarm_port> $ swarm manage --discovery zk://<zookeeper_addr1>,<zookeeper_addr2>/<path> -H tcp://<swarm_ip:swarm_port>
# use the regular docker cli # use the regular docker cli
$ docker -H <swarm_ip:swarm_port> info $ docker -H tcp://<swarm_ip:swarm_port> info
$ docker -H <swarm_ip:swarm_port> run ... $ docker -H tcp://<swarm_ip:swarm_port> run ...
$ docker -H <swarm_ip:swarm_port> ps $ docker -H tcp://<swarm_ip:swarm_port> ps
$ docker -H <swarm_ip:swarm_port> logs ... $ docker -H tcp://<swarm_ip:swarm_port> logs ...
... ...
# list nodes in your cluster # list nodes in your cluster