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 %} 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 diff --git a/compose/install.md b/compose/install.md index 746a72dc69..fa9a5219f1 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 @@ -88,13 +98,15 @@ 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 ``` +**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. -2. Test the installation. +3. Test the installation. ```powershell docker-compose --version @@ -110,8 +122,7 @@ Docker Compose. To do so, follow these steps: 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: @@ -217,7 +228,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: 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. 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