From 7b0cf0b538bd5a7dc94863d7d61d150b61b2595b Mon Sep 17 00:00:00 2001 From: Anne Henmi Date: Wed, 14 Nov 2018 09:42:24 -0700 Subject: [PATCH 1/6] Updated to latest version, and made reference to older version as needed. --- install/windows/docker-ee.md | 41 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/install/windows/docker-ee.md b/install/windows/docker-ee.md index 644a14c959..6b6376332e 100644 --- a/install/windows/docker-ee.md +++ b/install/windows/docker-ee.md @@ -1,7 +1,7 @@ --- -description: How to install Docker EE for Windows Server -keywords: Windows, Windows Server, install, download, ucp, Docker EE -title: Install Docker Enterprise Edition for Windows Server +description: How to install Docker Engine - Enterprise for Windows Server +keywords: Windows, Windows Server, install, download, ucp, Docker Engine - Enterprise +title: Install Docker Engine - Enterprise on Windows Servers redirect_from: - /docker-ee-for-windows/install/ - /engine/installation/windows/docker-ee/ @@ -9,15 +9,15 @@ redirect_from: {% capture filename %}{{ page.win_latest_build }}.zip{% endcapture %} {% capture download_url %}https://download.docker.com/components/engine/windows-server/{{ site.docker_ee_version }}/{{ filename }}{% endcapture %} -Docker Enterprise Edition for Windows Server (*Docker EE*) enables native Docker containers on Windows Server. Windows Server 2016 and later versions are supported. The Docker EE installation package includes everything you need to run Docker on Windows Server. This topic describes pre-install considerations, and how to download and install Docker EE. +Docker Engine - Enterprise enables native Docker containers on Windows Server. Windows Server 2016 and later versions are supported. The Docker Engine - Enterprise installation package includes everything you need to run Docker on Windows Server. This topic describes pre-install considerations, and how to download and install Docker Engine - Enterprise. > Release notes > > [Release notes for all versions](/release-notes/) -## Install Docker EE +## Install Docker Engine - Enterprise -Docker EE for Windows requires Windows Server 2016 or later. See +Docker Engine - Enterprise requires Windows Server 2016 or later. See [What to know before you install](#what-to-know-before-you-install) for a full list of prerequisites. @@ -39,7 +39,8 @@ full list of prerequisites. Restart-Computer ``` -3. Test your Docker EE installation by running the `hello-world` container. +3. Test your Docker Engine - Enterprise installation by running the + `hello-world` container. ```PowerShell docker run hello-world:nanoserver @@ -156,19 +157,19 @@ installs, or install on air-gapped systems. ## Install a specific version -There are currently two channels available for Docker EE for Windows Server: - -* `18.09` - Use this version if you're using Docker Enterprise 2.1 (Engine, UCP, DTR), or if you're running Docker Engine alone. `18.09` is the default. -* `17.06` - Use this version if you're using Docker Enterprise 2.0. +> ***NOTE:*** If you need to run Docker EE 2.0, please see the following instructions: +> * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Older Docker EE Engine only release +> * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Docker Enterprise Edition 2.0 (Docker Engine, +> UCP, and DTR). To install a specific version, use the `RequiredVersion` flag: ```PowerShell -Install-Package -Name docker -ProviderName DockerMsftProvider -Force -RequiredVersion 17.06 +Install-Package -Name docker -ProviderName DockerMsftProvider -Force -RequiredVersion 18.09 ... Name Version Source Summary ---- ------- ------ ------- -Docker 17.06.2-ee-17 Docker Contains Docker EE for use with Windows Server... +Docker 18.09.0 Docker Contains Docker Engine - Enterprise for use with Windows Server... ``` ### Updating the DockerMsftProvider @@ -180,12 +181,12 @@ Update-Module DockerMsftProvider Then open a new Powershell session for the update to take effect. -## Update Docker EE +## Update Docker Engine - Enterprise -To update Docker EE Engine to the most recent release, specify the `-RequiredVersion` and `-Update` flags: +To update Docker Engine - Enterprise to the most recent release, specify the `-RequiredVersion` and `-Update` flags: ```PowerShell -Install-Package -Name docker -ProviderName DockerMsftProvider -RequiredVersion 18.03.1-ee-2 -Update -Force +Install-Package -Name docker -ProviderName DockerMsftProvider -RequiredVersion 18.09 -Update -Force ``` The required version must match any of the versions available in this json file: https://dockermsft.blob.core.windows.net/dockercontainer/DockerMsftIndex.json @@ -193,7 +194,7 @@ The required version must match any of the versions available in this json file: ## Preparing a Docker EE Engine for use with UCP Run the -[UCP installation script for Windows](/datacenter/ucp/2.2/guides/admin/configure/join-windows-worker-nodes/#run-the-windows-node-setup-script). +[UCP installation script for Windows](/datacenter/ucp/3.0/guides/admin/configure/join-windows-worker-nodes/#run-the-windows-node-setup-script). Start the Docker service: @@ -203,13 +204,13 @@ Start-Service Docker ## What to know before you install -* **What the Docker EE for Windows install includes**: The installation +* **What the Docker Engine - Enterprise install includes**: The installation provides [Docker Engine](/engine/userguide/intro.md) and the [Docker CLI client](/engine/reference/commandline/cli.md). -## About Docker EE containers and Windows Server +## About Docker Engine - Enterprise containers and Windows Server -Looking for information on using Docker EE containers? +Looking for information on using Docker Engine - Enterprise containers? * [Getting Started with Windows Containers (Lab)](https://github.com/docker/labs/blob/master/windows/windows-containers/README.md) provides a tutorial on how to set up and run Windows containers on Windows 10 From 0493410d259c5d84514767daee81916d9d44644b Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Wed, 14 Nov 2018 14:32:59 -0700 Subject: [PATCH 2/6] Update docker-ee.md --- install/windows/docker-ee.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/install/windows/docker-ee.md b/install/windows/docker-ee.md index 6b6376332e..b1464f4e5b 100644 --- a/install/windows/docker-ee.md +++ b/install/windows/docker-ee.md @@ -157,11 +157,6 @@ installs, or install on air-gapped systems. ## Install a specific version -> ***NOTE:*** If you need to run Docker EE 2.0, please see the following instructions: -> * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Older Docker EE Engine only release -> * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Docker Enterprise Edition 2.0 (Docker Engine, -> UCP, and DTR). - To install a specific version, use the `RequiredVersion` flag: ```PowerShell @@ -202,8 +197,6 @@ Start the Docker service: Start-Service Docker ``` -## What to know before you install - * **What the Docker Engine - Enterprise install includes**: The installation provides [Docker Engine](/engine/userguide/intro.md) and the [Docker CLI client](/engine/reference/commandline/cli.md). From 59bc5a9b76217ba46344c8ddc9eb26647f5442b3 Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Thu, 15 Nov 2018 11:13:44 -0700 Subject: [PATCH 3/6] Update docker-ee.md System requirement updates. --- install/windows/docker-ee.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/install/windows/docker-ee.md b/install/windows/docker-ee.md index b1464f4e5b..e7418a1eb3 100644 --- a/install/windows/docker-ee.md +++ b/install/windows/docker-ee.md @@ -15,6 +15,18 @@ Docker Engine - Enterprise enables native Docker containers on Windows Server. W > > [Release notes for all versions](/release-notes/) +## System requirements + +Windows OS requirements around specific CPU and RAM requirements also need to be met as specified +in the [Windows Server Requirements](https://docs.microsoft.com/en-us/windows-server/get-started/system-requirements). +This provides information for specific CPU and memory specs and capabilities (instruction sets like CMPXCHG16b, +LAHF/SAHF, and PrefetchW, security: DEP/NX, etc.). + +* OS Versions: Server 2016 (Core and GUI), 1709 and 1803 and soon Server 2019 (Core and GUI) +* RAM: 4GB +* Disk space: [32 GB minimum recommendation for Windows](https://docs.microsoft.com/en-us/windows-server/get-started/system-requirements); however, 64GB of space for Windows Server core base images (10 GB inclucing 8GB in +server 2016 but reduced drastically to < 2 GB + server core image < 1 GB), and buffers for new containers. + ## Install Docker Engine - Enterprise Docker Engine - Enterprise requires Windows Server 2016 or later. See From a1b9d272fc3b5db7f63f31e350ce8c705eea2a65 Mon Sep 17 00:00:00 2001 From: Anne Henmi Date: Thu, 15 Nov 2018 11:19:22 -0700 Subject: [PATCH 4/6] Fixed per https://github.com/docker/docs-private/issues/875 --- .../join-windows-nodes-to-cluster.md | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md b/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md index da31e56e1b..ed2a03f2b1 100644 --- a/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md +++ b/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md @@ -1,25 +1,25 @@ --- title: Join Windows worker nodes to your cluster -description: Join worker nodes that are running on Windows Server 2016 to a Docker EE cluster. -keywords: Docker EE, UCP, cluster, scale, worker, Windows +description: Join worker nodes that are running on Windows Server to a Docker Enterprise cluster. +keywords: Docker Enterprise, UCP, cluster, scale, worker, Windows redirect_from: - /datacenter/ucp/3.0/guides/admin/configure/join-nodes/join-windows-nodes-to-cluster/ --- -Docker Enterprise Edition supports worker nodes that run on Windows Server 2016 or 1709. -Only worker nodes are supported on Windows, and all manager nodes in the cluster +Docker Enterprise Edition supports worker nodes that run on Windows Server 2016, 1709, +or 1803. Only worker nodes are supported on Windows, and all manager nodes in the cluster must run on Linux. Follow these steps to enable a worker node on Windows. -1. Install Docker EE Engine on Windows Server 2016. +1. Install Docker Engine - Enterprise on Windows Server 2016, 1709, or 1803. 2. Configure the Windows node. 3. Join the Windows node to the cluster. -## Install Docker EE Engine on Windows Server 2016 or 1709 +## Install Docker Engine - Enterprise on Windows Server -[Install Docker EE Engine](/engine/installation/windows/docker-ee/#use-a-script-to-install-docker-ee) -on a Windows Server 2016 or 1709 instance to enable joining a cluster that's managed by +[Install Docker Engine - Enterprise](/engine/installation/windows/docker-ee/#use-a-script-to-install-docker-ee) +on a Windows Server 2016, 1709 or 1803 instance to enable joining a cluster that's managed by Docker Enterprise Edition. ## Configure the Windows node @@ -29,7 +29,7 @@ Follow these steps to configure the docker daemon and the Windows environment. 1. Add a label to the node. 2. Pull the Windows-specific image of `ucp-agent`, which is named `ucp-agent-win`. 3. Run the Windows worker setup script provided with `ucp-agent-win`. -4. Join the cluster with the token provided by the Docker EE web UI or CLI. +4. Join the cluster with the token provided by the Docker UCP web UI or CLI. ### Add a label to the node @@ -117,9 +117,9 @@ to the corresponding files in `C:\ProgramData\docker\daemoncerts`: ## Join the Windows node to the cluster Now you can join the cluster by using the `docker swarm join` command that's -provided by the Docker EE web UI and CLI. +provided by the Docker UCP web UI and CLI. -1. Log in to the Docker EE web UI with an administrator account. +1. Log in to the Docker UCP web UI with an administrator account. 2. Navigate to the **Nodes** page. 3. Click **Add Node** to add a new node. 4. In the **Node Type** section, click **Windows**. @@ -163,7 +163,7 @@ docker container run --rm {{ page.ucp_org }}/ucp-agent-win:{{ page.ucp_version } ### Open ports in the Windows firewall -Docker EE requires that ports 2376 and 12376 are open for inbound TCP traffic. +Docker Enterprise requires that ports 2376 and 12376 are open for inbound TCP traffic. In a PowerShell terminal running as Administrator, run these commands to add rules to the Windows firewall. @@ -193,11 +193,11 @@ netsh advfirewall firewall add rule name="docker_proxy" dir=in action=allow prot Start-Service docker ``` -The `dockerd` service and the Windows environment are now configured to join a Docker EE cluster. +The `dockerd` service and the Windows environment are now configured to join a Docker Enterprise cluster. > TLS certificate setup > -> If the TLS certificates aren't set up correctly, the Docker EE web UI shows the +> If the TLS certificates aren't set up correctly, the Docker UCP web UI shows the > following warning. > > ``` From f1cdbcf1b267bd9cf6db41199115f380aac26b7b Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Thu, 15 Nov 2018 11:49:54 -0700 Subject: [PATCH 5/6] Update docker-ee.md --- install/windows/docker-ee.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/install/windows/docker-ee.md b/install/windows/docker-ee.md index e7418a1eb3..df05f577d8 100644 --- a/install/windows/docker-ee.md +++ b/install/windows/docker-ee.md @@ -22,14 +22,15 @@ in the [Windows Server Requirements](https://docs.microsoft.com/en-us/windows-se This provides information for specific CPU and memory specs and capabilities (instruction sets like CMPXCHG16b, LAHF/SAHF, and PrefetchW, security: DEP/NX, etc.). -* OS Versions: Server 2016 (Core and GUI), 1709 and 1803 and soon Server 2019 (Core and GUI) +* OS Versions: Server 2016 (Core and GUI), 1709 and 1803 * RAM: 4GB -* Disk space: [32 GB minimum recommendation for Windows](https://docs.microsoft.com/en-us/windows-server/get-started/system-requirements); however, 64GB of space for Windows Server core base images (10 GB inclucing 8GB in -server 2016 but reduced drastically to < 2 GB + server core image < 1 GB), and buffers for new containers. +* Disk space: [32 GB minimum recommendation for Windows](https://docs.microsoft.com/en-us/windows-server/get-started/system + requirements). An additional 32 GB of Space is recommended for base images for ServerCore and NanoServer along with buffer + space for workload containers running IIS, SQL Server and .Net apps. ## Install Docker Engine - Enterprise -Docker Engine - Enterprise requires Windows Server 2016 or later. See +Docker Engine - Enterprise requires Windows Server 2016, 1703, or 1803. See [What to know before you install](#what-to-know-before-you-install) for a full list of prerequisites. From 36033c25aeb16d7122c29c4b42d1eb3ecfea4a76 Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Thu, 15 Nov 2018 15:56:27 -0700 Subject: [PATCH 6/6] Update join-windows-nodes-to-cluster.md --- .../join-nodes/join-windows-nodes-to-cluster.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md b/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md index ed2a03f2b1..e0b8e911fc 100644 --- a/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md +++ b/ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md @@ -6,7 +6,7 @@ redirect_from: - /datacenter/ucp/3.0/guides/admin/configure/join-nodes/join-windows-nodes-to-cluster/ --- -Docker Enterprise Edition supports worker nodes that run on Windows Server 2016, 1709, +Docker Enterprise 2.1 supports worker nodes that run on Windows Server 2016, 1709, or 1803. Only worker nodes are supported on Windows, and all manager nodes in the cluster must run on Linux. @@ -20,7 +20,7 @@ Follow these steps to enable a worker node on Windows. [Install Docker Engine - Enterprise](/engine/installation/windows/docker-ee/#use-a-script-to-install-docker-ee) on a Windows Server 2016, 1709 or 1803 instance to enable joining a cluster that's managed by -Docker Enterprise Edition. +Docker Enterprise 2.1. ## Configure the Windows node @@ -29,7 +29,7 @@ Follow these steps to configure the docker daemon and the Windows environment. 1. Add a label to the node. 2. Pull the Windows-specific image of `ucp-agent`, which is named `ucp-agent-win`. 3. Run the Windows worker setup script provided with `ucp-agent-win`. -4. Join the cluster with the token provided by the Docker UCP web UI or CLI. +4. Join the cluster with the token provided by the Docker UCP web interface or CLI. ### Add a label to the node @@ -117,9 +117,9 @@ to the corresponding files in `C:\ProgramData\docker\daemoncerts`: ## Join the Windows node to the cluster Now you can join the cluster by using the `docker swarm join` command that's -provided by the Docker UCP web UI and CLI. +provided by the Docker UCP web interface and CLI. -1. Log in to the Docker UCP web UI with an administrator account. +1. Log in to the Docker UCP web interface with an administrator account. 2. Navigate to the **Nodes** page. 3. Click **Add Node** to add a new node. 4. In the **Node Type** section, click **Windows**. @@ -197,7 +197,7 @@ The `dockerd` service and the Windows environment are now configured to join a D > TLS certificate setup > -> If the TLS certificates aren't set up correctly, the Docker UCP web UI shows the +> If the TLS certificates aren't set up correctly, the Docker UCP web interface shows the > following warning. > > ```