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/8] 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/8] 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: From e485786420422f235811e628c19876801b7e2bb5 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Couaillier <41171215+dockerpac@users.noreply.github.com> Date: Mon, 18 Mar 2019 22:42:53 +0100 Subject: [PATCH 3/8] Change default http port Since UCP 3.1, the default port is now 8080 for HTTP (previously 80) --- ee/ucp/interlock/deploy/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/ucp/interlock/deploy/index.md b/ee/ucp/interlock/deploy/index.md index 73d109d08d..ef1b8026c8 100644 --- a/ee/ucp/interlock/deploy/index.md +++ b/ee/ucp/interlock/deploy/index.md @@ -11,7 +11,7 @@ page, and click the **Layer 7 Routing** option. Check the **Enable Layer 7 Routi ![http routing mesh](../../images/interlock-install-3.png){: .with-border} -By default, the routing mesh service listens on port 80 for HTTP and port +By default, the routing mesh service listens on port 8080 for HTTP and port 8443 for HTTPS. Change the ports if you already have services that are using them. From ed87d31a0048d42b49ed6de87e69cf8b71eff7e5 Mon Sep 17 00:00:00 2001 From: usha-mandya Date: Fri, 22 Mar 2019 10:48:33 +0000 Subject: [PATCH 4/8] fix formatting issues in completion.md file --- compose/completion.md | 58 ++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/compose/completion.md b/compose/completion.md index 91c8ba2cd4..d05b66ee0e 100644 --- a/compose/completion.md +++ b/compose/completion.md @@ -17,11 +17,12 @@ Make sure bash completion is installed. 1. On a current Linux OS (in a non-minimal installation), bash completion should be available. + 2. Place the completion script in `/etc/bash_completion.d/`. -```shell -sudo curl -L https://raw.githubusercontent.com/docker/compose/{{site.compose_version}}/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose -``` + ```shell + sudo curl -L https://raw.githubusercontent.com/docker/compose/{{site.compose_version}}/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose + ``` ### Mac @@ -32,17 +33,17 @@ sudo curl -L https://raw.githubusercontent.com/docker/compose/{{site.compose_ver For example, when running this command on Mac 10.13.2, place the completion script in `/usr/local/etc/bash_completion.d/`. -```shell -sudo curl -L https://raw.githubusercontent.com/docker/compose/{{site.compose_version}}/contrib/completion/bash/docker-compose -o /usr/local/etc/bash_completion.d/docker-compose -``` + ```shell + sudo curl -L https://raw.githubusercontent.com/docker/compose/{{site.compose_version}}/contrib/completion/bash/docker-compose -o /usr/local/etc/bash_completion.d/docker-compose + ``` 3. Add the following to your `~/.bash_profile`: -```shell -if [ -f $(brew --prefix)/etc/bash_completion ]; then + ```shell + if [ -f $(brew --prefix)/etc/bash_completion ]; then . $(brew --prefix)/etc/bash_completion -fi -``` + fi + ``` 4. You can source your `~/.bash_profile` or launch a new terminal to utilize completion. @@ -50,13 +51,14 @@ completion. ##### Install via MacPorts 1. Run `sudo port install bash-completion` to install bash completion. + 2. Add the following lines to `~/.bash_profile`: -```shell -if [ -f /opt/local/etc/profile.d/bash_completion.sh ]; then + ```shell + if [ -f /opt/local/etc/profile.d/bash_completion.sh ]; then . /opt/local/etc/profile.d/bash_completion.sh -fi -``` + fi + ``` 3. You can source your `~/.bash_profile` or launch a new terminal to utilize completion. @@ -72,34 +74,34 @@ Add `docker` and `docker-compose` to the plugins list in `~/.zshrc` to run autoc ```shell plugins=(... docker docker-compose ) -``` + ``` #### Without oh-my-zsh shell 1. Place the completion script in your `/path/to/zsh/completion` (typically `~/.zsh/completion/`): -```shell -$ mkdir -p ~/.zsh/completion -$ curl -L https://raw.githubusercontent.com/docker/compose/{{site.compose_version}}/contrib/completion/zsh/_docker-compose > ~/.zsh/completion/_docker-compose -``` + ```shell + $ mkdir -p ~/.zsh/completion + $ curl -L https://raw.githubusercontent.com/docker/compose/{{site.compose_version}}/contrib/completion/zsh/_docker-compose > ~/.zsh/completion/_docker-compose + ``` 2. Include the directory in your `$fpath` by adding in `~/.zshrc`: -```shell -fpath=(~/.zsh/completion $fpath) -``` + ```shell + fpath=(~/.zsh/completion $fpath) + ``` 3. Make sure `compinit` is loaded or do it by adding in `~/.zshrc`: -```shell -autoload -Uz compinit && compinit -i -``` + ```shell + autoload -Uz compinit && compinit -i + ``` 4. Then reload your shell: -```shell -exec $SHELL -l -``` + ```shell + exec $SHELL -l + ``` ## Available completions From 0540ee39dd7bd67dc5a4f55d6270d9a3e526be6a Mon Sep 17 00:00:00 2001 From: Eiichi Kitagawa Date: Fri, 22 Mar 2019 09:19:38 -0700 Subject: [PATCH 5/8] Fixing download location Download command below points to a dir that doesn't exist ``` Invoke-WebRequest "https://github.com/docker/compose/releases/download/1.23.2/docker-compose-Windows-x86_64.exe" -UseBasicParsing -OutFile $Env:ProgramFiles\Docker\Docker\resources\bin\docker-compose.exe ``` On Windows Server 2019 (and probably on 2016), other exe files are under "$Env:ProgramFiles\Docker\" so that should be a good place to put the compose's executable. This directory is also registered in "PATH" of the system, so users can call out `docker-compose --version` command on the next step without additional configuration. --- compose/install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/install.md b/compose/install.md index 746a72dc69..a3dcb25f54 100644 --- a/compose/install.md +++ b/compose/install.md @@ -88,7 +88,7 @@ Docker Compose. To do so, follow these steps: Compose (v{{site.compose_version}}): ```powershell - Invoke-WebRequest "https://github.com/docker/compose/releases/download/{{site.compose_version}}/docker-compose-Windows-x86_64.exe" -UseBasicParsing -OutFile $Env:ProgramFiles\Docker\Docker\resources\bin\docker-compose.exe + Invoke-WebRequest "https://github.com/docker/compose/releases/download/{{site.compose_version}}/docker-compose-Windows-x86_64.exe" -UseBasicParsing -OutFile $Env:ProgramFiles\Docker\docker-compose.exe ``` > To install a different version of Compose, substitute `{{site.compose_version}}` From 912303182572b566969bb301c82758ba9e0dea26 Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Fri, 22 Mar 2019 12:53:09 -0400 Subject: [PATCH 6/8] Added note --- compose/install.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compose/install.md b/compose/install.md index a3dcb25f54..14c88dcf3b 100644 --- a/compose/install.md +++ b/compose/install.md @@ -91,6 +91,8 @@ Docker Compose. To do so, follow these steps: Invoke-WebRequest "https://github.com/docker/compose/releases/download/{{site.compose_version}}/docker-compose-Windows-x86_64.exe" -UseBasicParsing -OutFile $Env:ProgramFiles\Docker\docker-compose.exe ``` +**Note**: On Windows Server 2019, you can add the Compose executable to `$Env:ProgramFiles\Docker`. Because this directory is registered in the system `PATH`, you can run the `docker-compose --version` command on the subsequent step with no additional configuration. + > To install a different version of Compose, substitute `{{site.compose_version}}` > with the version of Compose you want to use. From 0331c00bf5f87544abf3bb6cb8e703e0c8f05668 Mon Sep 17 00:00:00 2001 From: John Reese Date: Fri, 22 Mar 2019 21:52:40 -0400 Subject: [PATCH 7/8] Add missing bold markup --- _includes/kubernetes-mac-win.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/kubernetes-mac-win.md b/_includes/kubernetes-mac-win.md index 7cb7e1676e..093a7c81a6 100644 --- a/_includes/kubernetes-mac-win.md +++ b/_includes/kubernetes-mac-win.md @@ -15,7 +15,7 @@ Usage: {% include kubernetes-mac-win.md platform="mac" %} {% capture min-version %}{{ product }} 18.06.0-ce-mac70 CE{% endcapture %} {% capture version-caveat %} - **Kubernetes is only available in {{ min-version }} and higher. + **Kubernetes is only available in {{ min-version }} and higher.** {% endcapture %} {% capture local-kubectl-warning %} @@ -34,7 +34,7 @@ Usage: {% include kubernetes-mac-win.md platform="mac" %} {% capture min-version %}{{ product }} 18.06.0-ce-win70 CE{% endcapture %} {% capture version-caveat %} - **Kubernetes is only available in {{ min-version }} and higher. + **Kubernetes is only available in {{ min-version }} and higher.** {% endcapture %} {% capture local-kubectl-warning %} From 8a8ea7d666a85ffe2078338b8842015de03eb69e Mon Sep 17 00:00:00 2001 From: Wang Jie Date: Mon, 25 Mar 2019 09:35:26 +0800 Subject: [PATCH 8/8] Update seccomp.md --- engine/security/seccomp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/security/seccomp.md b/engine/security/seccomp.md index 01e677c18f..c001f28c7a 100644 --- a/engine/security/seccomp.md +++ b/engine/security/seccomp.md @@ -29,7 +29,7 @@ The default `seccomp` profile provides a sane default for running containers wit seccomp and disables around 44 system calls out of 300+. It is moderately protective while providing wide application compatibility. The default Docker profile can be found -[here](https://github.com/moby/moby/blob/master/profiles/seccomp/default.json)). +[here](https://github.com/moby/moby/blob/master/profiles/seccomp/default.json). In effect, the profile is a whitelist which denies access to system calls by default, then whitelists specific system calls. The profile works by defining a