From 2aa780abe4813225787ece380ad4d6bbbdf0768a Mon Sep 17 00:00:00 2001 From: Charles Smith Date: Fri, 26 Aug 2016 15:55:26 -0700 Subject: [PATCH] Merge pull request #26028 from londoncalling/docs-pinata-for-swarm Clarify how to use d4mac, d4win with swarm mode (cherry picked from commit 6072e6bfd20598f4e9cb28d32c09bfddec6df76c) Signed-off-by: Charles Smith --- docs/swarm/swarm-tutorial/create-swarm.md | 6 ++++++ docs/swarm/swarm-tutorial/index.md | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/swarm/swarm-tutorial/create-swarm.md b/docs/swarm/swarm-tutorial/create-swarm.md index 57e67ba353..3188cf655c 100644 --- a/docs/swarm/swarm-tutorial/create-swarm.md +++ b/docs/swarm/swarm-tutorial/create-swarm.md @@ -25,6 +25,12 @@ node. For example, the tutorial uses a machine named `manager1`. docker swarm init --advertise-addr ``` + >**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` machine: diff --git a/docs/swarm/swarm-tutorial/index.md b/docs/swarm/swarm-tutorial/index.md index 1c00c4700e..1887186079 100644 --- a/docs/swarm/swarm-tutorial/index.md +++ b/docs/swarm/swarm-tutorial/index.md @@ -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) will serve as the single swarm node. -

+

* 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