Merge pull request #53 from olljanat/updated-windows-guides

Updated Windows deployment guides

docs/source/agent.rst

@@ -38,7 +38,7 @@ Overall, the setup consists of the following steps:
 
 ::
 
-  $ docker network create --driver overlay portainer_agent_network
+  $ docker network create --driver overlay --attachable portainer_agent_network
 
 *Step 2*, deploying the Agent as a `global` service in your cluster:
 
@@ -49,6 +49,7 @@ Overall, the setup consists of the following steps:
       --network portainer_agent_network \
       -e AGENT_CLUSTER_ADDR=tasks.portainer_agent \
       --mode global \
+      --constraint 'node.platform.os == linux' \
       --mount type=bind,src=//var/run/docker.sock,dst=/var/run/docker.sock \
       portainer/agent
 
@@ -64,6 +65,15 @@ Overall, the setup consists of the following steps:
       --constraint 'node.role == manager' \
       portainer/portainer -H "tcp://tasks.portainer_agent:9001" --tlsskipverify
 
+*Step 4*, deploying the Agent for all Windows Server nodes
+
+Because of Docker limitation you need deploy Agent to all Windows Server nodes by running following command on each of them.
+
+::
+
+  $ docker run -d --name portainer_agent --restart always --network portainer_agent_network -e AGENT_CLUSTER_ADDR=tasks.agent --mount type=npipe,source=\\.\pipe\docker_engine,target=\\.\pipe\docker_engine portainer/agent:windows1803-amd64
+
+
 Connecting an existing Portainer instance to an agent
 -----------------------------------------------------
 
@@ -106,10 +116,13 @@ Alternatively, you can deploy the agent using the following stack:
         - portainer_agent
       deploy:
         mode: global
+      placement:
+        constraints: [node.platform.os == linux]
 
   networks:
     portainer_agent:
       driver: overlay
+      attachable: true
 
 Configuration
 -------------

docs/source/deployment.rst

@@ -45,12 +45,27 @@ to persist the data on the Docker host folder:
 
   $ docker run -d -p 9000:9000 --name portainer --restart always -v /var/run/docker.sock:/var/run/docker.sock -v /path/on/host/data:/data portainer/portainer
 
-Example on Windows:
+Windows
+----------------------------------------------------------
+Docker for Windows 10 supports running both Linux and Windows containers and you need use different start command depending which one you are using.
+Windows Server supports only native Windows containers.
+
+Example for Linux containers:
 
 ::
 
-  $ docker run -d -p 9000:9000 --name portainer --restart always -v /var/run/docker.sock:/var/run/docker.sock -v C:\ProgramData\Portainer:C:\data portainer/portainer
+  $ docker run -d -p 9000:9000 --name portainer --restart always -v /var/run/docker.sock:/var/run/docker.sock -v C:\ProgramData\Portainer:/data portainer/portainer
 
+
+Example for native Windows containers:
+
+::
+
+  $ docker run -d -p 9000:9000 --name portainer --restart always -v \\.\pipe\docker_engine:\\.\pipe\docker_engine -v C:\ProgramData\Portainer:/data portainer/portainer
+
+
+Docker Swarm service
+----------------------------------------------------------
 If you deployed Portainer as a Docker Swarm service:
 
 ::