From 25fffa2f1870dd29c0fc61ac8d4a6178c4640188 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 6 Mar 2019 14:01:35 +0100 Subject: [PATCH 1/2] Compose: put Windows Server in its own tab for installation Signed-off-by: Sebastiaan van Stijn --- compose/install.md | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/compose/install.md b/compose/install.md index bda848a198..9c246a050b 100644 --- a/compose/install.md +++ b/compose/install.md @@ -42,6 +42,7 @@ Python package manager or installing Compose as a container. @@ -60,7 +61,7 @@ Docker install instructions for these are here:
-### Install Compose on Windows systems +### Install Compose on Windows desktop systems **Docker Desktop for Windows** and **Docker Toolbox** already include Compose along with other Docker apps, so most Windows users do not need to @@ -69,16 +70,25 @@ install Compose separately. Docker install instructions for these are here: * [Get Docker Desktop for Windows](/docker-for-windows/install.md) * [Get Docker Toolbox](/toolbox/overview.md) (for older systems) -**If you are running the Docker daemon and client directly on Microsoft -Windows Server 2016** (with [Docker EE for Windows Server 2016](/install/windows/docker-ee.md), you _do_ need to install -Docker Compose. To do so, follow these steps: +If you are running the Docker daemon and client directly on Microsoft +Windows Server, follow the instructions in the "Windows Server" tab. + +
+
+ +### Install Compose on Windows Server + +Follow these instructions if you are running the Docker daemon and client directly +on Microsoft Windows Server with [Docker Engine - Enterprise](/install/windows/docker-ee.md), +and want to install Docker Compose. + 1. Start an "elevated" PowerShell (run it as administrator). Search for PowerShell, right-click, and choose **Run as administrator**. When asked if you want to allow this app to make changes to your device, click **Yes**. - In PowerShell, since Github now requires TLS1.2, run the following: +2. In PowerShell, since Github now requires TLS1.2, run the following: ```powershell [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 @@ -94,7 +104,7 @@ Docker Compose. To do so, follow these steps: > To install a different version of Compose, substitute `{{site.compose_version}}` > with the version of Compose you want to use. -2. Test the installation. +3. Test the installation. ```powershell docker-compose --version From 927d53239b63193eeb9ff50f38cc27f3567b1b07 Mon Sep 17 00:00:00 2001 From: L-Hudson <44844738+L-Hudson@users.noreply.github.com> Date: Wed, 6 Mar 2019 17:01:25 -0500 Subject: [PATCH 2/2] Update install.md editorial crx --- compose/install.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/compose/install.md b/compose/install.md index 9c246a050b..8e98e196fd 100644 --- a/compose/install.md +++ b/compose/install.md @@ -33,7 +33,7 @@ Python package manager or installing Compose as a container. > > The instructions below outline installation of the current stable release > (**v{{site.compose_version}}**) of Compose. To install a different version of -> compose, replace the given release number with the one that you want. Compose +> Compose, replace the given release number with the one that you want. Compose > releases are also listed and available for direct download on the > [Compose repository release page on GitHub](https://github.com/docker/compose/releases){:target="_blank" class="_"}. > To install a **pre-release** of Compose, refer to the [install pre-release builds](#install-pre-release-builds) @@ -71,7 +71,7 @@ install Compose separately. Docker install instructions for these are here: * [Get Docker Toolbox](/toolbox/overview.md) (for older systems) If you are running the Docker daemon and client directly on Microsoft -Windows Server, follow the instructions in the "Windows Server" tab. +Windows Server, follow the instructions in the Windows Server tab.
@@ -88,7 +88,7 @@ and want to install Docker Compose. **Run as administrator**. When asked if you want to allow this app to make changes to your device, click **Yes**. -2. In PowerShell, since Github now requires TLS1.2, run the following: +2. In PowerShell, since GitHub now requires TLS1.2, run the following: ```powershell [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 @@ -120,8 +120,7 @@ and want to install Docker Compose. On Linux, you can download the Docker Compose binary from the [Compose repository release page on GitHub](https://github.com/docker/compose/releases){: target="_blank" class="_"}. Follow the instructions from the link, which involve -running the `curl` command in your terminal to download the binaries. These step -by step instructions are also included below. +running the `curl` command in your terminal to download the binaries. These step-by-step instructions are also included below. 1. Run this command to download the current stable release of Docker Compose: @@ -227,7 +226,7 @@ version 1.3, Compose uses Docker labels to keep track of containers, and your containers need to be recreated to add the labels. If Compose detects containers that were created without labels, it refuses -to run so that you don't end up with two sets of them. If you want to keep using +to run, so that you don't end up with two sets of them. If you want to keep using your existing containers (for example, because they have data volumes you want to preserve), you can use Compose 1.5.x to migrate them with the following command: