Merge branch 'master' into consolidation-changes

Author: Jeffrey Morgan

README.md

@@ -307,7 +307,7 @@ In order to keep the Git repository light, _please_ compress the images
 (losslessly).  On Mac you may use (ImageOptim)[https://imageoptim.com] for
 instance.  Be sure to compress the images *before* adding them to the
 repository, doing it afterwards actually worsens the impact on the Git repo (but
-still optimizes the bandwith during browsing).
+still optimizes the bandwidth during browsing).
 
 ## Building archives and the live published docs
 

_config.yml

@@ -23,7 +23,7 @@ latest_stable_docker_engine_api_version: "1.37"
 docker_ce_stable_version: "18.03"
 docker_ce_edge_version: "18.05"
 docker_ee_version: "17.06"
-compose_version: "1.22.0"
+compose_version: "1.23.1"
 machine_version: "0.14.0"
 distribution_version: "2.6"
 dtr_version: "2.5"
@@ -92,7 +92,7 @@ defaults:
   - scope:
       path: "install"
     values:
-      win_latest_build: "docker-17.06.2-ee-16"
+      win_latest_build: "docker-17.06.2-ee-17"
   - scope:
       path: "datacenter"
     values:
@@ -102,21 +102,21 @@ defaults:
     values:
       dtr_org: "docker"
       dtr_repo: "dtr"
-      dtr_version: "2.5.5"
+      dtr_version: "2.5.6"
   - scope:
       path: "datacenter/dtr/2.4"
     values:
       hide_from_sitemap: true
       dtr_org: "docker"
       dtr_repo: "dtr"
-      dtr_version: "2.4.6"
+      dtr_version: "2.4.7"
   - scope:
       path: "datacenter/dtr/2.3"
     values:
       hide_from_sitemap: true
       dtr_org: "docker"
       dtr_repo: "dtr"
-      dtr_version: "2.3.8"
+      dtr_version: "2.3.9"
   - scope:
       path: "datacenter/dtr/2.2"
     values:
@@ -138,23 +138,23 @@ defaults:
     values:
       ucp_org: "docker"
       ucp_repo: "ucp"
-      ucp_version: "3.0.5"
+      ucp_version: "3.0.6"
   - scope: # This is a bit of a hack for the get-support.md topic.
       path: "ee"
     values:
       ucp_org: "docker"
       ucp_repo: "ucp"
       dtr_repo: "dtr"
-      ucp_version: "3.0.5"
+      ucp_version: "3.0.6"
       dtr_version: "2.5.0"
-      dtr_latest_image: "docker/dtr:2.5.5"
+      dtr_latest_image: "docker/dtr:2.5.6"
   - scope:
       path: "datacenter/ucp/2.2"
     values:
       hide_from_sitemap: true
       ucp_org: "docker"
       ucp_repo: "ucp"
-      ucp_version: "2.2.13"
+      ucp_version: "2.2.14"
   - scope:
       path: "datacenter/ucp/2.1"
     values:

_data/ddc_offline_files_2.yaml

@@ -6,6 +6,16 @@
 - product: "ucp"
   version: "3.0"
   tar-files:
+    - description: "3.0.6 Linux"
+      url: https://packages.docker.com/caas/ucp_images_3.0.6.tar.gz
+    - description: "3.0.6 IBM Z"
+      url: https://packages.docker.com/caas/ucp_images_s390x_3.0.6.tar.gz
+    - description: "3.0.6 Windows Server 2016 LTSC"
+      url: https://packages.docker.com/caas/ucp_images_win_2016_3.0.6.tar.gz
+    - description: "3.0.6 Windows Server 1709"
+      url: https://packages.docker.com/caas/ucp_images_win_1709_3.0.6.tar.gz
+    - description: "3.0.6 Windows Server 1803"
+      url: https://packages.docker.com/caas/ucp_images_win_1803_3.0.6.tar.gz
     - description: "3.0.5 Linux"
       url: https://packages.docker.com/caas/ucp_images_3.0.5.tar.gz
     - description: "3.0.5 IBM Z"
@@ -53,6 +63,12 @@
 - product: "ucp"
   version: "2.2"
   tar-files:
+    - description: "2.2.14 Linux"
+      url: https://packages.docker.com/caas/ucp_images_2.2.14.tar.gz
+    - description: "2.2.14 IBM Z"
+      url: https://packages.docker.com/caas/ucp_images_s390x_2.2.14.tar.gz
+    - description: "2.2.14 Windows"
+      url: https://packages.docker.com/caas/ucp_images_win_2.2.14.tar.gz
     - description: "2.2.13 Linux"
       url: https://packages.docker.com/caas/ucp_images_2.2.13.tar.gz
     - description: "2.2.13 IBM Z"
@@ -128,33 +144,27 @@
 - product: "dtr"
   version: "2.5"
   tar-files:
+    - description: "DTR 2.5.6 Linux x86"
+      url: https://packages.docker.com/caas/dtr_images_2.5.6.tar.gz
     - description: "DTR 2.5.5 Linux x86"
       url: https://packages.docker.com/caas/dtr_images_2.5.5.tar.gz
-    - description: "DTR 2.5.5 IBM Z"
-      url: https://packages.docker.com/caas/dtr_images_s390x_2.5.5.tar.gz
     - description: "DTR 2.5.3 Linux x86"
       url: https://packages.docker.com/caas/dtr_images_2.5.3.tar.gz
-    - description: "DTR 2.5.3 IBM Z"
-      url: https://packages.docker.com/caas/dtr_images_s390x_2.5.3.tar.gz
     - description: "DTR 2.5.2 Linux x86"
       url: https://packages.docker.com/caas/dtr_images_2.5.2.tar.gz
-    - description: "DTR 2.5.2 IBM Z"
-      url: https://packages.docker.com/caas/dtr_images_s390x_2.5.2.tar.gz
     - description: "DTR 2.5.1 Linux x86"
       url: https://packages.docker.com/caas/dtr_images_2.5.1.tar.gz
-    - description: "DTR 2.5.1 IBM Z"
-      url: https://packages.docker.com/caas/dtr_images_s390x_2.5.1.tar.gz
     - description: "DTR 2.5.0 Linux x86"
       url: https://packages.docker.com/caas/dtr_images_2.5.0.tar.gz
-    - description: "DTR 2.5.0 IBM Z"
-      url: https://packages.docker.com/caas/dtr_images_s390x_2.5.0.tar.gz
 - product: "dtr"
   version: "2.4"
   tar-files:
+    - description: "DTR 2.4.7 Linux x86"
+      url: https://packages.docker.com/caas/dtr_images_2.4.7.tar.gz
     - description: "DTR 2.4.6 Linux x86"
       url: https://packages.docker.com/caas/dtr_images_2.4.6.tar.gz
     - description: "DTR 2.4.6 IBM Z"
-      url: https://packages.docker.com/caas/dtr_images_s390x_2.4.6.tar.gz  
+      url: https://packages.docker.com/caas/dtr_images_s390x_2.4.6.tar.gz
     - description: "DTR 2.4.5 Linux x86"
       url: https://packages.docker.com/caas/dtr_images_2.4.5.tar.gz
     - description: "DTR 2.4.5 IBM Z"
@@ -182,6 +192,8 @@
 - product: "dtr"
   version: "2.3"
   tar-files:
+    - description: "DTR 2.3.9"
+      url: https://packages.docker.com/caas/dtr_images_2.3.9.tar.gz  
     - description: "DTR 2.3.8"
       url: https://packages.docker.com/caas/dtr_images_2.3.8.tar.gz  
     - description: "DTR 2.3.7"

_includes/ee-linux-install-reuse.md

@@ -116,6 +116,16 @@ You only need to set up the repository once, after which you can install Docker
 
 {% endif %}
 
+{% if linux-dist == "oraclelinux" %}
+
+5.  Enable the `ol7_addons` Oracle repository. This ensures access to the `container-selinux` package required by `docker-ee`.
+
+    ```bash
+    $ sudo yum-config-manager --enable ol7_addons
+    ```
+
+{% endif %}
+
 6.  Add the Docker EE **stable** repository:
 
     ```bash
@@ -301,6 +311,6 @@ You must delete any edited configuration files manually.
 
 - Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md){: target="_blank" class="_" }
 
-- Continue with user guides on [Universal Control Plane (UCP)](/datacenter/ucp/2.2/guides/){: target="_blank" class="_" } and [Docker Trusted Registry (DTR)](/datacenter/dtr/2.4/guides/){: target="_blank" class="_" }
+- Continue with user guides on [Universal Control Plane (UCP)](/ee/ucp/){: target="_blank" class="_" } and [Docker Trusted Registry (DTR)](/ee/dtr/){: target="_blank" class="_" }
 
 {% endif %}

_includes/install-script.md

@@ -42,20 +42,24 @@ $ curl -fsSL https://get.docker.com -o get-docker.sh
 $ sudo sh get-docker.sh
 
 <output truncated>
+```
 
 If you would like to use Docker as a non-root user, you should now consider
 adding your user to the "docker" group with something like:
 
+```bash
   sudo usermod -aG docker your-user
+```
 
 Remember to log out and back in for this to take effect!
 
-WARNING: Adding a user to the "docker" group grants the ability to run
-         containers which can be used to obtain root privileges on the
-         docker host.
-         Refer to https://docs.docker.com/engine/security/security/#docker-daemon-attack-surface
-         for more information.
-```
+> **Warning**:
+>
+> Adding a user to the "docker" group grants the ability to run containers
+> which can be used to obtain root privileges on the  docker host. Refer to
+> [Docker Daemon Attack Surface](https://docs.docker.com/engine/security/security/#docker-daemon-attack-surface)
+> for more information.
+{:.warning}
 
 Docker CE is installed. It starts automatically on `DEB`-based distributions. On
 `RPM`-based distributions, you need to start it manually using the appropriate

_includes/kubernetes-mac-win.md

@@ -12,12 +12,11 @@ Usage: {% include kubernetes-mac-win.md platform="mac" %}
 {% if platform == "mac" %}
   {% assign product = "Docker for Mac" %}
 
-  {% capture min-version %}{{ product }} 17.12 CE Edge{% endcapture %}
-
+  {% capture min-version %}{{ product }} **17.12 CE Edge**{% endcapture %}
+  
   {% capture version-caveat %}
-**Kubernetes is only available in {{ min-version }} and higher, on the Edge
-channel.** Kubernetes support is not included in Docker for Mac Stable releases.
-  {% endcapture %}
+  Kubernetes is available in {{ min-version }} and higher, and **18.06 Stable** and higher
+  {% endcapture%}
 
   {% capture local-kubectl-warning %}
 > If you independently installed the Kubernetes CLI, `kubectl`, make sure that
@@ -32,26 +31,21 @@ channel.** Kubernetes support is not included in Docker for Mac Stable releases.
 {% elsif platform == "windows" %}
   {% assign product = "Docker for Windows" %}
 
-  {% capture min-version %}{{ product }} 18.02 CE Edge{% endcapture %}
+  {% capture min-version %}{{ product }} **18.02 CE Edge**{% endcapture %}
 
   {% capture version-caveat %}
-  **Kubernetes is only available in {{ min-version }}.** Kubernetes
-  support is not included in {{ product }} 18.02 CE Stable.
+  Kubernetes is available in {{ min-version }} and higher, and **18.06 Stable** and higher
   {% endcapture %}
 
   {% capture local-kubectl-warning %}
-If you installed `kubectl` by another method, and experience conflicts, remove it.
+  If you installed `kubectl` by another method, and experience conflicts, remove it.
   {% endcapture %}
 
   {% assign kubectl-path = "C:\>Program Files\Docker\Docker\Resources\bin\kubectl.exe" %}
 
 {% endif %}
 
-{{ version-caveat }} To find out more about Stable and Edge channels and how to
-switch between them, see
-[General configuration](/docker-for-{{ platform }}/#general).
-
-{{ min-version }} includes a standalone Kubernetes server and client,
+{{ version-caveat }}, this includes a standalone Kubernetes server and client,
 as well as Docker CLI integration. The Kubernetes server runs locally within
 your Docker instance, is not configurable, and is a single-node cluster.
 

compose/aspnet-mssql-compose.md

@@ -55,8 +55,8 @@ configure this app to use our SQL Server database, and then create a
 
     This file defines how to build the web app image. It uses the
     [microsoft/aspnetcore-build](https://hub.docker.com/r/microsoft/aspnetcore-build/),
-    map the volume with the generated code, restore the dependencies, build the
-    project and expose port 80. After that, it calls an `entrypoint` script
+    maps the volume with the generated code, restores the dependencies, builds the
+    project and exposes port 80. After that, it calls an `entrypoint` script
     that we create in the next step.
 
 1.  The `Dockerfile` makes use of an entrypoint to your webapp Docker
@@ -186,7 +186,7 @@ configure this app to use our SQL Server database, and then create a
     Go ahead and try out the website! This sample uses the SQL Server
     database image in the back-end for authentication.
 
-Ready! You now have a ASP.NET Core application running against SQL Server in
+Ready! You now have an ASP.NET Core application running against SQL Server in
 Docker Compose! This sample made use of some of the most popular Microsoft
 products for Linux. To learn more about Windows Containers, check out
 [Docker Labs for Windows Containers](https://github.com/docker/labs/tree/master/windows)

compose/completion.md

@@ -29,7 +29,7 @@ On a Mac, add the following to your `~/.bash_profile`:
 
 ```shell
 if [ -f $(brew --prefix)/etc/bash_completion ]; then
-. $(brew --prefix)/etc/bash_completion
+    . $(brew --prefix)/etc/bash_completion
 fi
 ```
 

compose/compose-file/compose-file-v1.md

@@ -415,7 +415,7 @@ id.
 Sets the PID mode to the host PID mode. This turns on sharing between
 container and the host operating system the PID address space. Containers
 launched with this flag can access and manipulate other
-containers in the bare-metal machine's namespace and vise-versa.
+containers in the bare-metal machine's namespace and vice versa.
 
 ### ports
 

compose/compose-file/compose-file-v2.md

@@ -1006,7 +1006,7 @@ designated container or service.
 If set to "host", the service's PID mode is the host PID mode.  This turns
 on sharing between container and the host operating system the PID address
 space. Containers launched with this flag can access and manipulate
-other containers in the bare-metal machine's namespace and vise-versa.
+other containers in the bare-metal machine's namespace and vice versa.
 
 > **Note**: the `service:` and `container:` forms require
 > [version 2.1](compose-versioning.md#version-21) or above
@@ -1483,7 +1483,7 @@ Set a custom name for this volume.
       data:
         name: my-app-data
 
-It can also be used in conjuction with the `external` property:
+It can also be used in conjunction with the `external` property:
 
     version: '2.1'
     volumes:
@@ -1641,7 +1641,7 @@ Set a custom name for this network.
       network1:
         name: my-app-net
 
-It can also be used in conjuction with the `external` property:
+It can also be used in conjunction with the `external` property:
 
     version: '2.1'
     networks: