beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #26028 from londoncalling/docs-pinata-for-swarm

Browse source 
Clarify how to use d4mac, d4win with swarm mode
(cherry picked from commit 6072e6bfd2)

Signed-off-by: Charles Smith <charles.smith@docker.com>
This commit is contained in:
Charles Smith 2016-08-26 15:55:26 -07:00
parent af9378f713
commit 2aa780abe4
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/swarm/swarm-tutorial/create-swarm.md
View file

@ -25,6 +25,12 @@ node. For example, the tutorial uses a machine named `manager1`.
docker swarm init --advertise-addr <MANAGER-IP> docker swarm init --advertise-addr <MANAGER-IP>
``` ```
>**Note:** If you are using Docker for Mac or Docker for Windows to test
single-node swarm, simply run `docker swarm init` with no arguments. There is no
need to specify ` --advertise-addr` in this case. To learn more, see the topic
on how to [Use Docker for Mac or Docker for
Windows](index.md#use-docker-for-mac-or-docker-for-windows) with Swarm.
In the tutorial, the following command creates a swarm on the `manager1` In the tutorial, the following command creates a swarm on the `manager1`
machine: machine:

2
docs/swarm/swarm-tutorial/index.md
View file

@ -83,7 +83,7 @@ mode, including initializing a swarm with a single node, creating services,
and scaling services. Docker "Moby" on Hyperkit (Mac) or Hyper-V (Windows) and scaling services. Docker "Moby" on Hyperkit (Mac) or Hyper-V (Windows)
will serve as the single swarm node. will serve as the single swarm node.
<p /> <br /><br />
* Currently, you cannot use Docker for Mac or Windows alone to test a * Currently, you cannot use Docker for Mac or Windows alone to test a
_multi-node_ swarm. However, you can use the included version of [Docker _multi-node_ swarm. However, you can use the included version of [Docker