diff --git a/README.md b/README.md
index 2c7f1854a3..cd94bb9dcb 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,9 @@
# Docs @ Docker
+Welcome to the repo for our documentation. This is the source for
+[https://docs.docker.com/](https://docs.docker.com/).
-Welcome to the repo for our documentation. This is the source for
-[https://docs.docker.com/](https://docs.docker.com/).
-
-Feel free to send us pull requests and file issues. Our docs are completely
+Feel free to send us pull requests and file issues. Our docs are completely
open source and we deeply appreciate contributions from our community!
-
## Table of Contents
- [Providing feedback](#providing-feedback)
@@ -360,7 +358,7 @@ If you are using a version of the documentation that is no longer supported, whi
- By entering your version number and selecting it from the branch selection list for this repo
- By directly accessing the Github URL for your version. For example, https://github.com/docker/docker.github.io/tree/v1.9 for `v1.9`
-- By running a container of the specific [tag for your documentation version](https://cloud.docker.com/u/docs/repository/docker/docs/docker.github.io/general#read-these-docs-offline)
+- By running a container of the specific [tag for your documentation version](https://hub.docker.com/r/docs/docker.github.io/tags)
in Docker Hub. For example, run the following to access `v1.9`:
```bash
diff --git a/_data/glossary.yaml b/_data/glossary.yaml
index d9728852cd..13f15a1823 100644
--- a/_data/glossary.yaml
+++ b/_data/glossary.yaml
@@ -199,8 +199,8 @@
*Also known as : docker-machine*
namespace: |
A [Linux namespace](http://man7.org/linux/man-pages/man7/namespaces.7.html)
- is a Linux kernel feature that isolates and virtualizes system resources. Processes which restricted to
- a class="glossary" namespace can only interact with resources or processes that are part of the same namespace. Namespaces
+ is a Linux kernel feature that isolates and virtualizes system resources. Processes which are restricted to
+ a namespace can only interact with resources or processes that are part of the same namespace. Namespaces
are an important part of Docker's isolation model. Namespaces exist for each type of
resource, including `net` (networking), `mnt` (storage), `pid` (processes), `uts` (hostname control),
and `user` (UID mapping). For more information about namespaces, see [Docker run reference](/engine/reference/run/)
diff --git a/_data/toc.yaml b/_data/toc.yaml
index f37933a284..2ef78f4649 100644
--- a/_data/toc.yaml
+++ b/_data/toc.yaml
@@ -86,12 +86,6 @@ guides:
title: Binaries
- path: /install/linux/linux-postinstall/
title: Optional Linux post-installation steps
- - title: MacOS
- path: /docker-for-mac/install/
- nosync: true
- - title: Microsoft Windows
- path: /docker-for-windows/install/
- nosync: true
- sectiontitle: Docker Enterprise
section:
- title: About Docker Enterprise
@@ -110,9 +104,6 @@ guides:
title: Ubuntu
- path: /install/windows/docker-ee/
title: Microsoft Windows Server
- - title: Release notes
- path: /engine/release-notes/
- nosync: true
- sectiontitle: Compatibility between Docker versions
section:
- path: /engine/ce-ee-node-activate/
@@ -133,13 +124,13 @@ guides:
section:
- title: "Part 1: Orientation and setup"
path: /get-started/
- - title: "Part 2: Containerizing an Application"
+ - title: "Part 2: Containerizing an application"
path: /get-started/part2/
- title: "Part 3: Deploying to Kubernetes"
path: /get-started/part3/
- title: "Part 4: Deploying to Swarm"
path: /get-started/part4/
- - title: "Part 5: Sharing Images on Docker Hub"
+ - title: "Part 5: Sharing images on Docker Hub"
path: /get-started/part5/
- path: /get-started/resources/
title: "Educational resources"
@@ -161,20 +152,8 @@ guides:
title: Docker build enhancements for 18.09
- path: /develop/develop-images/multistage-build/
title: Use multi-stage builds
- - path: /engine/reference/builder/
- title: Dockerfile reference
- nosync: true
- path: /develop/develop-images/image_management/
title: Manage images
- - path: /samples/
- title: Docker app examples
- nosync: true
- - sectiontitle: Develop using the Docker Engine SDKs and API
- section:
- - path: /develop/sdk/
- title: Overview
- - path: /develop/sdk/examples/
- title: SDK and API examples
- sectiontitle: Configure networking
section:
- path: /network/
@@ -215,7 +194,6 @@ guides:
title: (Legacy) Container links
- path: /network/overlay-standalone.swarm/
title: Overlay networks for Swarm Classic
-
- sectiontitle: Manage application data
section:
- path: /storage/
@@ -262,12 +240,6 @@ guides:
title: Configure and run Docker
- path: /config/daemon/systemd/
title: Control Docker with systemd
- - path: /config/labels-custom-metadata/
- title: Apply custom metadata to daemons
- nosync: true
- - path: /config/containers/logging/configure/
- title: Configuring default drivers
- nosync: true
- sectiontitle: Work with external tools
section:
- path: /config/thirdparty/
@@ -286,12 +258,6 @@ guides:
title: Container runtime metrics
- path: /config/containers/resource_constraints/
title: Runtime options with Memory, CPUs, and GPUs
- - path: /config/labels-custom-metadata/
- title: Apply custom metadata to containers
- nosync: true
- - path: /config/pruning/
- title: Prune unused containers
- nosync: true
- sectiontitle: Logging
section:
- path: /config/containers/logging/
@@ -328,9 +294,6 @@ guides:
title: Journald logging driver
- path: /config/containers/logging/splunk/
title: Splunk logging driver
- - path: /registry/recipes/mirror/
- title: Run a local registry mirror
- nosync: true
- sectiontitle: Work with external tools
section:
- path: /config/thirdparty/dsc/
@@ -341,8 +304,6 @@ guides:
title: Chef
- path: /config/thirdparty/puppet/
title: Puppet
- - path: /config/thirdparty/ambassador_pattern_linking/
- title: (Obsolete) Link via an ambassador container
- sectiontitle: Security
section:
- path: /engine/security/security/
@@ -375,6 +336,8 @@ guides:
title: Seccomp security profiles for Docker
- path: /engine/security/userns-remap/
title: Isolate containers with a user namespace
+ - path: /engine/security/rootless/
+ title: Run the Docker daemon as a non-root user (Rootless mode)
- sectiontitle: Scale your app
section:
- path: /engine/swarm/
@@ -427,8 +390,6 @@ guides:
title: Manage sensitive data with Docker secrets
- path: /engine/swarm/swarm_manager_locking/
title: Lock your swarm
- - path: /engine/swarm/networking/
- title: Manage swarm service networks
- path: /engine/swarm/admin_guide/
title: Swarm administration guide
- path: /engine/swarm/raft/
@@ -483,29 +444,34 @@ guides:
title: FedRAMP
- path: /compliance/fisma/
title: FISMA
-
- sectiontitle: Open source at Docker
section:
- path: /opensource/
title: Contribute to documentation
- path: /opensource/ways/
title: Other ways to contribute
-
- sectiontitle: Documentation archive
section:
- path: /docsarchive/
title: View the docs archives
- - path: /hackathon/
- title: Docs hackathon results
reference:
- sectiontitle: File formats
section:
- title: Dockerfile reference
path: /engine/reference/builder/
- - title: Compose file reference
- path: /compose/compose-file/
- nosync: true
+ - sectiontitle: Compose file reference
+ section:
+ - path: /compose/compose-file/
+ title: Version 3
+ - path: /compose/compose-file/compose-file-v2/
+ title: Version 2
+ - path: /compose/compose-file/compose-file-v1/
+ title: Version 1
+ - path: /compose/compose-file/compose-versioning/
+ title: About versions and upgrading
+ - path: /compose/faq/
+ title: Frequently asked questions
- sectiontitle: Command-Line Interfaces (CLIs)
section:
@@ -629,7 +595,6 @@ reference:
title: docker checkpoint ls
- path: /engine/reference/commandline/checkpoint_rm/
title: docker checkpoint rm
-
- sectiontitle: docker cluster *
section:
- path: /engine/reference/commandline/cluster/
@@ -1070,14 +1035,64 @@ reference:
title: docker volume rm
- path: /engine/reference/commandline/wait/
title: docker wait
+ - sectiontitle: Docker Compose CLI reference
+ section:
+ - path: /compose/reference/overview/
+ title: Overview of docker-compose CLI
+ - path: /compose/reference/envvars/
+ title: CLI environment variables
+ - path: /compose/completion/
+ title: Command-line completion
+ - path: /compose/reference/build/
+ title: build
+ - path: /compose/reference/bundle/
+ title: bundle
+ - path: /compose/reference/config/
+ title: config
+ - path: /compose/reference/create/
+ title: create
+ - path: /compose/reference/down/
+ title: down
+ - path: /compose/reference/events/
+ title: events
+ - path: /compose/reference/exec/
+ title: exec
+ - path: /compose/reference/help/
+ title: help
+ - path: /compose/reference/kill/
+ title: kill
+ - path: /compose/reference/logs/
+ title: logs
+ - path: /compose/reference/pause/
+ title: pause
+ - path: /compose/reference/port/
+ title: port
+ - path: /compose/reference/ps/
+ title: ps
+ - path: /compose/reference/pull/
+ title: pull
+ - path: /compose/reference/push/
+ title: push
+ - path: /compose/reference/restart/
+ title: restart
+ - path: /compose/reference/rm/
+ title: rm
+ - path: /compose/reference/run/
+ title: run
+ - path: /compose/reference/scale/
+ title: scale
+ - path: /compose/reference/start/
+ title: start
+ - path: /compose/reference/stop/
+ title: stop
+ - path: /compose/reference/top/
+ title: top
+ - path: /compose/reference/unpause/
+ title: unpause
+ - path: /compose/reference/up/
+ title: up
- title: Daemon CLI (dockerd)
path: /engine/reference/commandline/dockerd/
- - title: Machine (docker-machine) CLI
- path: /machine/reference/
- nosync: true
- - title: Compose (docker-compose) CLI
- path: /compose/reference/overview/
- nosync: true
- sectiontitle: DTR CLI
section:
- path: /reference/dtr/2.7/cli/
@@ -1126,7 +1141,6 @@ reference:
title: uninstall-ucp
- path: /reference/ucp/3.2/cli/upgrade/
title: upgrade
-
- sectiontitle: Application Programming Interfaces (APIs)
section:
- sectiontitle: Docker Engine API
@@ -1191,23 +1205,52 @@ reference:
title: v1.18 reference
- title: DTR API
path: /reference/dtr/2.7/api/
- - title: UCP API
- path: /reference/ucp/3.2/api/
- title: Registry API
path: /registry/spec/api/
- nosync: true
-
+ - title: Template API
+ path: /app-template/api-reference/
+ - title: UCP API
+ path: /reference/ucp/3.2/api/
- sectiontitle: Drivers and specifications
section:
- - title: Image specification
- path: /registry/spec/manifest-v2-2/
- - title: Machine drivers
- path: /machine/drivers/os-base/
- - title: Registry token authentication
- path: /registry/spec/auth/
- - title: Registry storage drivers
- path: /registry/storage-drivers/
-
+ - sectiontitle: Registry image manifests
+ section:
+ - path: /registry/spec/manifest-v2-1/
+ title: Image manifest v 2, schema 1
+ - path: /registry/spec/manifest-v2-2/
+ title: Image manifest v 2, schema 2
+ - path: /registry/spec/deprecated-schema-v1/
+ title: Update deprecated schema v1 images
+ - sectiontitle: Registry token authorization
+ section:
+ - path: /registry/spec/auth/
+ title: Docker Registry token authentication
+ - path: /registry/spec/auth/jwt/
+ title: Token authentication implementation
+ - path: /registry/spec/auth/oauth/
+ title: Oauth2 token authentication
+ - path: /registry/spec/auth/scope/
+ title: Token scope documentation
+ - path: /registry/spec/auth/token/
+ title: Token authentication specification
+ - sectiontitle: Registry storage drivers
+ section:
+ - path: /registry/storage-drivers/
+ title: Storage driver overview
+ - path: /registry/storage-drivers/oss/
+ title: Aliyun OSS storage driver
+ - path: /registry/storage-drivers/filesystem/
+ title: Filesystem storage driver
+ - path: /registry/storage-drivers/gcs/
+ title: GCS storage driver
+ - path: /registry/storage-drivers/inmemory/
+ title: In-memory storage driver
+ - path: /registry/storage-drivers/azure/
+ title: Microsoft Azure storage driver
+ - path: /registry/storage-drivers/s3/
+ title: S3 storage driver
+ - path: /registry/storage-drivers/swift/
+ title: Swift storage driver
- sectiontitle: Compliance control references
section:
- sectiontitle: NIST 800-53
@@ -1305,13 +1348,8 @@ manuals:
title: Cluster file structure
- path: /cluster/reference/envvars/
title: Environment variables
- - path: /cluster/reference/
- title: Subcommands
- sectiontitle: Docker Engine - Enterprise
section:
- - path: /ee/supported-platforms/
- title: Install Docker Engine - Enterprise
- nosync: true
- title: Release notes
path: /engine/release-notes/
- sectiontitle: Universal Control Plane
@@ -1336,6 +1374,8 @@ manuals:
section:
- path: /ee/ucp/admin/install/cloudproviders/install-on-azure/
title: Install on Azure
+ - path: /ee/ucp/admin/install/cloudproviders/install-on-azure-custom/
+ title: Custom Azure roles
- path: /ee/ucp/admin/install/cloudproviders/install-on-aws/
title: Install on AWS
- path: /ee/ucp/admin/install/upgrade/
@@ -1364,6 +1404,8 @@ manuals:
title: Create UCP audit logs
- path: /ee/ucp/admin/configure/enable-saml-authentication/
title: Enable SAML authentication
+ - path: /ee/ucp/admin/configure/integrate-saml/
+ title: SAML integration
- path: /ee/ucp/admin/configure/integrate-scim/
title: SCIM integration
- path: /ee/ucp/admin/configure/enable-helm-tiller/
@@ -1416,9 +1458,6 @@ manuals:
path: /ee/admin/backup/back-up-ucp/
- title: Restore UCP
path: /ee/admin/restore/restore-ucp/
- - title: CLI reference
- path: /reference/ucp/3.2/cli/
- nosync: true
- sectiontitle: Authorize role-based access
section:
- path: /ee/ucp/authorization/
@@ -1507,10 +1546,6 @@ manuals:
path: /ee/ucp/interlock/usage/canary/
- title: Using context or path-based routing
path: /ee/ucp/interlock/usage/context/
- - title: Specifying a routing mode
- path: /ee/ucp/interlock/usage/interlock-vip-mode/
- - title: Using routing labels
- path: /ee/ucp/interlock/usage/labels-reference/
- title: Publishing a default host service
path: /ee/ucp/interlock/usage/default-backend/
- title: Specifying a routing mode
@@ -1571,9 +1606,6 @@ manuals:
path: /ee/ucp/kubernetes/cluster-ingress/canary/
- title: Implementing Persistent (sticky) Sessions
path: /ee/ucp/kubernetes/cluster-ingress/sticky/
- - title: API reference
- path: /reference/ucp/3.2/api/
- nosync: true
- path: /ee/ucp/release-notes/
title: Release notes
- sectiontitle: Previous versions
@@ -2692,9 +2724,9 @@ manuals:
- title: Repair a cluster
path: /ee/dtr/admin/disaster-recovery/repair-a-cluster/
- title: Create a backup
- path: /ee/dtr/admin/disaster-recovery/create-a-backup/
+ path: /ee/admin/backup/back-up-dtr/
- title: Restore from a backup
- path: /ee/dtr/admin/disaster-recovery/restore-from-backup/
+ path: /ee/admin/restore/restore-dtr/
- title: CLI reference
path: /reference/dtr/2.7/cli/
nosync: true
@@ -3758,9 +3790,6 @@ manuals:
section:
- path: /ee/docker-ee-architecture/
title: Docker Enterprise Architecture
- - path: /ee/supported-platforms/
- title: Supported platforms
- nosync: true
- path: /ee/end-to-end-install/
title: Deploy Docker Enterprise
- path: /ee/upgrade/
@@ -3771,24 +3800,12 @@ manuals:
title: Overview
- path: /ee/admin/backup/back-up-swarm/
title: Back up Docker Swarm
- - path: /ee/admin/backup/back-up-ucp/
- title: Back up UCP
- - path: /ee/admin/backup/back-up-dtr/
- title: Back up DTR
- - path: /engine/reference/commandline/cluster_backup/
- title: Back up clusters with Docker Cluster
- sectiontitle: Restore Docker Enterprise
section:
- path: /ee/admin/restore/
title: Overview
- path: /ee/admin/restore/restore-swarm/
title: Restore Docker Swarm
- - path: /ee/admin/restore/restore-ucp/
- title: Restore UCP
- - path: /ee/admin/restore/restore-dtr/
- title: Restore DTR
- - path: /cluster/reference/restore/
- title: Restore clusters with Docker Cluster
- sectiontitle: Disaster Recovery
section:
- path: /ee/admin/disaster-recovery/
@@ -3813,28 +3830,10 @@ manuals:
title: Images
- path: /assemble/adv-backend-manage/
title: Advanced Backend Management
- - path: /engine/reference/commandline/assemble/
- title: CLI reference
-- sectiontitle: Docker App
- section:
- - path: /app/working-with-app/
- title: Working with Docker App
- - path: /engine/reference/commandline/app/
- title: CLI reference
-- sectiontitle: Docker Template
- section:
- - path: /app-template/working-with-template/
- title: Working with Docker Template
- - path: /app-template/api-reference/
- title: API reference
- - path: /engine/reference/commandline/template/
- title: CLI reference
-- sectiontitle: Docker Buildx
- section:
- - path: /buildx/working-with-buildx/
- title: Working with Docker Buildx
- - path: /engine/reference/commandline/buildx/
- title: CLI reference
+- path: /app/working-with-app/
+ title: Docker App
+- path: /buildx/working-with-buildx/
+ title: Docker Buildx
- sectiontitle: Docker Compose
section:
- path: /compose/
@@ -3843,74 +3842,6 @@ manuals:
title: Install Compose
- path: /compose/gettingstarted/
title: Getting started
- - sectiontitle: Compose (docker-compose) CLI reference
- section:
- - path: /compose/reference/overview/
- title: Overview of docker-compose CLI
- - path: /compose/reference/envvars/
- title: CLI environment variables
- - path: /compose/completion/
- title: Command-line completion
- - path: /compose/reference/build/
- title: build
- - path: /compose/reference/bundle/
- title: bundle
- - path: /compose/reference/config/
- title: config
- - path: /compose/reference/create/
- title: create
- - path: /compose/reference/down/
- title: down
- - path: /compose/reference/events/
- title: events
- - path: /compose/reference/exec/
- title: exec
- - path: /compose/reference/help/
- title: help
- - path: /compose/reference/kill/
- title: kill
- - path: /compose/reference/logs/
- title: logs
- - path: /compose/reference/pause/
- title: pause
- - path: /compose/reference/port/
- title: port
- - path: /compose/reference/ps/
- title: ps
- - path: /compose/reference/pull/
- title: pull
- - path: /compose/reference/push/
- title: push
- - path: /compose/reference/restart/
- title: restart
- - path: /compose/reference/rm/
- title: rm
- - path: /compose/reference/run/
- title: run
- - path: /compose/reference/scale/
- title: scale
- - path: /compose/reference/start/
- title: start
- - path: /compose/reference/stop/
- title: stop
- - path: /compose/reference/top/
- title: top
- - path: /compose/reference/unpause/
- title: unpause
- - path: /compose/reference/up/
- title: up
- - sectiontitle: Compose file reference
- section:
- - path: /compose/compose-file/
- title: Version 3
- - path: /compose/compose-file/compose-file-v2/
- title: Version 2
- - path: /compose/compose-file/compose-file-v1/
- title: Version 1
- - path: /compose/compose-file/compose-versioning/
- title: About versions and upgrading
- - path: /compose/faq/
- title: Frequently asked questions
- path: /compose/bundles/
title: Docker stacks and distributed application bundles
- path: /compose/swarm/
@@ -3925,20 +3856,14 @@ manuals:
title: Networking in Compose
- path: /compose/production/
title: Using Compose in production
- - path: /compose/link-env-deprecated/
- title: Link environment variables (deprecated)
- path: /compose/startup-order/
title: Control startup order
- path: /compose/samples-for-compose/
title: Sample apps with Compose
- path: /release-notes/docker-compose/
title: Docker Compose release notes
-- sectiontitle: Docker Context
- section:
- - path: /engine/context/working-with-contexts/
- title: Working with Docker Contexts
- - path: /engine/reference/commandline/context/
- title: CLI reference
+- path: /engine/context/working-with-contexts/
+ title: Docker Context
- sectiontitle: Docker Desktop for Mac
section:
- path: /docker-for-mac/
@@ -3992,7 +3917,7 @@ manuals:
- path: /docker-for-windows/edge-release-notes/
title: Edge release notes
- path: /docker-for-windows/wsl-tech-preview/
- title: Docker Desktop WSL 2 Tech Preview
+ title: Docker Desktop WSL 2 backend
- title: Docker ID accounts
path: /docker-id/
- sectiontitle: Docker Hub
@@ -4045,8 +3970,6 @@ manuals:
title: Advanced automated builds
- path: /docker-hub/builds/link-source/
title: Link to GitHub and BitBucket
- - path: /docker-hub/builds/classic/
- title: Classic automated builds
- sectiontitle: Publisher & certified content
section:
- path: /docker-hub/publish/
@@ -4065,6 +3988,8 @@ manuals:
title: Trust chain
- path: /docker-hub/publish/byol/
title: Bring Your Own License (BYOL)
+- path: /app-template/working-with-template/
+ title: Docker Template
- sectiontitle: Open-source projects
section:
- sectiontitle: Docker Notary
@@ -4123,48 +4048,6 @@ manuals:
title: Compatibility
- path: /registry/help/
title: Getting help
- - sectiontitle: Registry reference
- section:
- - path: /registry/spec/api/
- title: Registry HTTP API v2
- - sectiontitle: Registry image manifests
- section:
- - path: /registry/spec/manifest-v2-1/
- title: Image manifest v 2, schema 1
- - path: /registry/spec/manifest-v2-2/
- title: Image manifest v 2, schema 2
- - path: /registry/spec/deprecated-schema-v1/
- title: Update deprecated schema v1 images
- - sectiontitle: Registry storage drivers
- section:
- - path: /registry/storage-drivers/
- title: Storage driver overview
- - path: /registry/storage-drivers/oss/
- title: Aliyun OSS storage driver
- - path: /registry/storage-drivers/filesystem/
- title: Filesystem storage driver
- - path: /registry/storage-drivers/gcs/
- title: GCS storage driver
- - path: /registry/storage-drivers/inmemory/
- title: In-memory storage driver
- - path: /registry/storage-drivers/azure/
- title: Microsoft Azure storage driver
- - path: /registry/storage-drivers/s3/
- title: S3 storage driver
- - path: /registry/storage-drivers/swift/
- title: Swift storage driver
- - sectiontitle: Registry specifications
- section:
- - path: /registry/spec/auth/
- title: Docker Registry token authentication
- - path: /registry/spec/auth/jwt/
- title: Token authentication implementation
- - path: /registry/spec/auth/oauth/
- title: Oauth2 token authentication
- - path: /registry/spec/auth/scope/
- title: Token scope documentation
- - path: /registry/spec/auth/token/
- title: Token authentication specification
- path: /release-notes/
title: Release notes
- sectiontitle: Superseded products and tools
diff --git a/_includes/content/ssh/ssh-overview.md b/_includes/content/ssh/ssh-overview.md
index 4a595008b8..63d03c50f5 100644
--- a/_includes/content/ssh/ssh-overview.md
+++ b/_includes/content/ssh/ssh-overview.md
@@ -1,4 +1,4 @@
-[SSH](/engine/reference/glossary.md#ssh) is a secure protocol for accessing remote machines and applications. It
+[SSH](/../../../glossary.md#SSH) is a secure protocol for accessing remote machines and applications. It
provides authentication and encrypts data communication over insecure networks.
These topics describe how to find existing SSH keys or generate new ones, and
diff --git a/_includes/ee-linux-install-reuse.md b/_includes/ee-linux-install-reuse.md
index 7a06b3faf1..695657c700 100644
--- a/_includes/ee-linux-install-reuse.md
+++ b/_includes/ee-linux-install-reuse.md
@@ -45,6 +45,14 @@ The advantage of using a repository from which to install Docker Engine - Enterp
{% elsif section == "set-up-yum-repo" %}
You only need to set up the repository once, after which you can install Docker Engine - Enterprise _from_ the repo and repeatedly upgrade as necessary.
+{% if linux-dist == "rhel" %}
+
+
+
+
1. Remove existing Docker repositories from `/etc/yum.repos.d/`:
```bash
@@ -63,14 +71,12 @@ You only need to set up the repository once, after which you can install Docker
$ sudo -E sh -c 'echo "$DOCKERURL/{{ linux-dist-url-slug }}" > /etc/yum/vars/dockerurl'
```
- {% if linux-dist == "rhel" %}
- Also, store your OS version string in `/etc/yum/vars/dockerosversion`. Most users should use `7`, but you can also use the more specific minor version, starting from `7.2`.
+ Also, store your OS version string in `/etc/yum/vars/dockerosversion`. Most users should use `7` or `8`, but you can also use the more specific minor version, starting from `7.2`.
```bash
$ sudo sh -c 'echo "7" > /etc/yum/vars/dockerosversion'
```
- {% endif %}
4. Install required packages: `yum-utils` provides the _yum-config-manager_ utility, and `device-mapper-persistent-data` and `lvm2` are required by the _devicemapper_ storage driver:
@@ -80,7 +86,6 @@ You only need to set up the repository once, after which you can install Docker
lvm2
```
-{% if linux-dist == "rhel" %}
5. Enable the `extras` RHEL repository. This ensures access to the `container-selinux` package required by `docker-ee`.
The repository can differ per your architecture and cloud provider, so review the options in this step before running:
@@ -113,9 +118,90 @@ You only need to set up the repository once, after which you can install Docker
```bash
$ sudo yum-config-manager --enable rhui-rhel-7-server-rhui-extras-rpms
```
+
+6. Add the Docker Engine - Enterprise **stable** repository:
+ ```bash
+ $ sudo -E yum-config-manager \
+ --add-repo \
+ "$DOCKERURL/{{ linux-dist-url-slug }}/docker-ee.repo"
+ ```
+
+
+
+1. Remove existing Docker repositories from `/etc/yum.repos.d/`:
+
+ ```bash
+ $ sudo rm /etc/yum.repos.d/docker*.repo
+ ```
+
+2. Temporarily store the URL (that you [copied above](#find-your-docker-ee-repo-url)) in an environment variable. Replace `` with your URL in the following command. This variable assignment does not persist when the session ends:
+
+ ```bash
+ $ export DOCKERURL=""
+ ```
+
+3. Store the value of the variable, `DOCKERURL` (from the previous step), in a `yum` variable in `/etc/yum/vars/`:
+
+ ```bash
+ $ sudo -E sh -c 'echo "$DOCKERURL/{{ linux-dist-url-slug }}" > /etc/yum/vars/dockerurl'
+ ```
+
+ Also, store your OS version string in `/etc/yum/vars/dockerosversion`. Most users should use `8`, but you can also use the more specific minor version.
+
+ ```bash
+ $ sudo sh -c 'echo "8" > /etc/yum/vars/dockerosversion'
+ ```
+
+
+4. Install required packages: `yum-utils` provides the _yum-config-manager_ utility, and `device-mapper-persistent-data` and `lvm2` are required by the _devicemapper_ storage driver:
+
+ ```bash
+ $ sudo yum install -y yum-utils \
+ device-mapper-persistent-data \
+ lvm2
+ ```
+
+5. Add the Docker Engine - Enterprise **stable** repository:
+
+ ```bash
+ $ sudo -E yum-config-manager \
+ --add-repo \
+ "$DOCKERURL/{{ linux-dist-url-slug }}/docker-ee.repo"
+ ```
+
+
+
{% endif %}
+{% if linux-dist != "rhel" %}
+
+1. Remove existing Docker repositories from `/etc/yum.repos.d/`:
+
+ ```bash
+ $ sudo rm /etc/yum.repos.d/docker*.repo
+ ```
+
+2. Temporarily store the URL (that you [copied above](#find-your-docker-ee-repo-url)) in an environment variable. Replace `` with your URL in the following command. This variable assignment does not persist when the session ends:
+
+ ```bash
+ $ export DOCKERURL=""
+ ```
+
+3. Store the value of the variable, `DOCKERURL` (from the previous step), in a `yum` variable in `/etc/yum/vars/`:
+
+ ```bash
+ $ sudo -E sh -c 'echo "$DOCKERURL/{{ linux-dist-url-slug }}" > /etc/yum/vars/dockerurl'
+ ```
+
+4. Install required packages: `yum-utils` provides the _yum-config-manager_ utility, and `device-mapper-persistent-data` and `lvm2` are required by the _devicemapper_ storage driver:
+
+ ```bash
+ $ sudo yum install -y yum-utils \
+ device-mapper-persistent-data \
+ lvm2
+ ```
+
{% if linux-dist == "oraclelinux" %}
5. Enable the `ol7_addons` Oracle repository. This ensures access to the `container-selinux` package required by `docker-ee`.
@@ -133,13 +219,13 @@ You only need to set up the repository once, after which you can install Docker
--add-repo \
"$DOCKERURL/{{ linux-dist-url-slug }}/docker-ee.repo"
```
-
+{% endif %}
{% elsif section == "install-using-yum-repo" %}
> **Note**: If you need to run Docker Engine - Enterprise 2.0, please see the following instructions:
> * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Older Docker Engine - Enterprise Engine only release
-> * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Docker Enterprise Edition 2.0 (Docker Engine,
+> * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Docker Enterprise Edition 2.0 (Docker Engine,
> UCP, and DTR).
1. Install the latest patch release, or go to the next step to install a specific version:
@@ -212,6 +298,15 @@ To manually install Docker Enterprise, download the `.{{ package-format | downca
{% elsif section == "install-using-yum-package" %}
{% if linux-dist == "rhel" %}
+
+
+
+
+
+
1. Enable the `extras` RHEL repository. This ensures access to the `container-selinux` package which is required by `docker-ee`:
```bash
@@ -219,26 +314,58 @@ To manually install Docker Enterprise, download the `.{{ package-format | downca
```
Alternately, obtain that package manually from Red Hat. There is no way to publicly browse this repository.
-{% endif %}
-{% if linux-dist == "centos" %}
-1. Go to the Docker Engine - Enterprise repository URL associated with your trial or subscription
- in your browser. Go to `{{ linux-dist-url-slug }}/7/x86_64/stable-/Packages`
- and download the `.{{ package-format | downcase }}` file for the Docker version you want to install.
-{% endif %}
+2. Go to the Docker Engine - Enterprise repository URL associated with your
+ trial or subscription in your browser. Go to
+ `{{ linux-dist-url-slug }}/`. Choose your {{ linux-dist-long }} version,
+ architecture, and Docker version. Download the
+ `.{{ package-format | downcase }}` file from the `Packages` directory.
+
+ > If you have trouble with `selinux` using the packages under the `7` directory,
+ > try choosing the version-specific directory instead, such as `7.3`.
+
+3. Install Docker Enterprise, changing the path below to the path where you downloaded
+ the Docker package.
+
+ ```bash
+ $ sudo yum install /path/to/package.rpm
+ ```
+
+ Docker is installed but not started. The `docker` group is created, but no
+ users are added to the group.
+
+4. Start Docker:
+
+ > If using `devicemapper`, ensure it is properly configured before starting Docker, per the [storage guide](/storage/storagedriver/device-mapper-driver/){: target="_blank" class="_" }.
+
+ ```bash
+ $ sudo systemctl start docker
+ ```
+
+5. Verify that Docker Engine - Enterprise is installed correctly by running the `hello-world`
+ image. This command downloads a test image, runs it in a container, prints
+ an informational message, and exits:
+
+ ```bash
+ $ sudo docker run hello-world
+ ```
+
+ Docker Engine - Enterprise is installed and running. Use `sudo` to run Docker commands. See
+ [Linux postinstall](/install/linux/linux-postinstall.md){: target="_blank" class="_" } to allow
+ non-privileged users to run Docker commands.
+
+
+
+
-{% if linux-dist == "rhel" or linux-dist == "oraclelinux" %}
1. Go to the Docker Engine - Enterprise repository URL associated with your
trial or subscription in your browser. Go to
`{{ linux-dist-url-slug }}/`. Choose your {{ linux-dist-long }} version,
architecture, and Docker version. Download the
`.{{ package-format | downcase }}` file from the `Packages` directory.
- {% if linux-dist == "rhel" %}
- > If you have trouble with `selinux` using the packages under the `7` directory,
- > try choosing the version-specific directory instead, such as `7.3`.
- {% endif %}
-{% endif %}
+ > If you have trouble with `selinux` using the packages under the `8` directory,
+ > try choosing the version-specific directory instead.
2. Install Docker Enterprise, changing the path below to the path where you downloaded
the Docker package.
@@ -270,6 +397,56 @@ To manually install Docker Enterprise, download the `.{{ package-format | downca
[Linux postinstall](/install/linux/linux-postinstall.md){: target="_blank" class="_" } to allow
non-privileged users to run Docker commands.
+
+
+
+{% endif %}
+{% if linux-dist != "rhel" %}
+{% if linux-dist == "centos" %}
+1. Go to the Docker Engine - Enterprise repository URL associated with your trial or subscription
+ in your browser. Go to `{{ linux-dist-url-slug }}/7/x86_64/stable-/Packages`
+ and download the `.{{ package-format | downcase }}` file for the Docker version you want to install.
+{% endif %}
+
+{% if linux-dist == "oraclelinux" %}
+1. Go to the Docker Engine - Enterprise repository URL associated with your
+ trial or subscription in your browser. Go to
+ `{{ linux-dist-url-slug }}/`. Choose your {{ linux-dist-long }} version,
+ architecture, and Docker version. Download the
+ `.{{ package-format | downcase }}` file from the `Packages` directory.
+
+{% endif %}
+
+2. Install Docker Enterprise, changing the path below to the path where you downloaded
+ the Docker package.
+
+ ```bash
+ $ sudo yum install /path/to/package.rpm
+ ```
+
+ Docker is installed but not started. The `docker` group is created, but no
+ users are added to the group.
+
+3. Start Docker:
+
+ > If using `devicemapper`, ensure it is properly configured before starting Docker, per the [storage guide](/storage/storagedriver/device-mapper-driver/){: target="_blank" class="_" }.
+
+ ```bash
+ $ sudo systemctl start docker
+ ```
+
+4. Verify that Docker Engine - Enterprise is installed correctly by running the `hello-world`
+ image. This command downloads a test image, runs it in a container, prints
+ an informational message, and exits:
+
+ ```bash
+ $ sudo docker run hello-world
+ ```
+
+ Docker Engine - Enterprise is installed and running. Use `sudo` to run Docker commands. See
+ [Linux postinstall](/install/linux/linux-postinstall.md){: target="_blank" class="_" } to allow
+ non-privileged users to run Docker commands.
+{% endif %}
{% elsif section == "upgrade-using-yum-package" %}
diff --git a/_includes/install-script.md b/_includes/install-script.md
index 326ebc7879..645b86e26a 100644
--- a/_includes/install-script.md
+++ b/_includes/install-script.md
@@ -66,6 +66,13 @@ Docker Engine - Community is installed. It starts automatically on `DEB`-based d
`systemctl` or `service` command. As the message indicates, non-root users can't
run Docker commands by default.
+> **Note**:
+>
+> To install Docker without root privileges, see
+> [Run the Docker daemon as a non-root user (Rootless mode)](/engine/security/rootless.md).
+>
+> Rootless mode is currently available as an experimental feature.
+
#### Upgrade Docker after using the convenience script
If you installed Docker using the convenience script, you should upgrade Docker
diff --git a/_layouts/docs.html b/_layouts/docs.html
index 8f8c8ad6c3..72c71e0fb6 100755
--- a/_layouts/docs.html
+++ b/_layouts/docs.html
@@ -179,7 +179,7 @@
{% unless page.notags == true %}
{% assign keywords = page.keywords | split:"," %}
{% for keyword in keywords %}{% assign strippedKeyword = keyword | strip %}
- {% capture keywordlist %}{{ keywordlist }}{{strippedKeyword}}{% unless forloop.last %}, {% endunless %}{% endcapture %}
+ {% capture keywordlist %}{{ keywordlist }}{{strippedKeyword}}{% unless forloop.last %}, {% endunless %}{% endcapture %}
{% endfor %}
{% if keywordlist.size > 0 %}{{ keywordlist }}{% endif %}
{% endunless %}
diff --git a/app-template/working-with-template.md b/app-template/working-with-template.md
index fe4961cc0d..1337148f5e 100644
--- a/app-template/working-with-template.md
+++ b/app-template/working-with-template.md
@@ -1,6 +1,6 @@
---
-title: Working with Docker Template (experimental)
-description: Working with Docker Application Template
+title: Docker Template
+description: Working with Docker Template
keywords: Docker, application template, Application Designer,
---
@@ -26,7 +26,7 @@ given service, and writes the output to the `/project` mounted folder.
definition. It contains the name of the service, description, and available
parameters such as ports, volumes, etc. For a complete list of parameters that
are allowed, see [Docker Template API
-reference](/ee/app-template/api-reference).
+reference](/app-template/api-reference/).
An _application template_ is a collection of one or more service templates. An
application template generates a Dockerfile per service and only one Compose
diff --git a/app/working-with-app.md b/app/working-with-app.md
index f293d5d9fd..7e7a3b2d16 100644
--- a/app/working-with-app.md
+++ b/app/working-with-app.md
@@ -1,5 +1,5 @@
---
-title: Working with Docker App (experimental)
+title: Docker App
description: Learn about Docker App
keywords: Docker App, applications, compose, orchestration
---
@@ -194,7 +194,7 @@ There are several options for deploying a Docker App project.
- Deploy as a Compose app application
- Deploy as a Docker Stack application
-All three options are discussed, starting with deploying as a native Dock App application.
+All three options are discussed, starting with deploying as a native Docker App application.
#### Deploy as a native Docker App
diff --git a/assemble/install.md b/assemble/install.md
index f96f093bbd..69dbe82e49 100644
--- a/assemble/install.md
+++ b/assemble/install.md
@@ -1,5 +1,5 @@
---
-title: Docker Assemble (experimental)
+title: Docker Assemble
description: Installing Docker Assemble
keywords: Assemble, Docker Enterprise, plugin, Spring Boot, .NET, c#, F#
---
diff --git a/buildx/working-with-buildx.md b/buildx/working-with-buildx.md
index b0b5c4c0c3..9d34d3adbf 100644
--- a/buildx/working-with-buildx.md
+++ b/buildx/working-with-buildx.md
@@ -1,5 +1,5 @@
---
-title: Working with Docker Buildx (experimental)
+title: Docker Buildx
description: Working with Docker Buildx
keywords: Docker, buildx, multi-arch
---
diff --git a/cluster/cluster-file.md b/cluster/cluster-file.md
index 9c2dae6b4c..c8f5f063ea 100644
--- a/cluster/cluster-file.md
+++ b/cluster/cluster-file.md
@@ -327,6 +327,36 @@ that are running on worker nodes.
*dev indicates that the functionality is only for development and testing. Arbitrary Kubernetes configuration parameters are not tested and supported under the Docker Enterprise Software Support Agreement.
+#### vpc
+
+If you are deploying on to AWS, by default Docker Cluster will create a new AWS
+VPC (Virtual Private Cloud) for the Docker Enterprise resources. To specify an
+existing VPC, a user can specify a VPC ID in the Cluster File.
+
+```yaml
+cluster:
+ vpc:
+ id: vpc-existing-vpc-id
+```
+
+Docker Cluster assumes the VPC CIDR is `172.31.0.0/16`, so will therefore
+attempt to create AWS subnets from this range. Docker Cluster can not utilise
+existing AWS subnets. To instruct Docker Cluster to provision subnets for an
+alternative CIDR you can pass a new CIDR into the Cluster File.
+
+```yaml
+cluster:
+ vpc:
+ id: vpc-existing-vpc-id
+ cidr: "192.168.0.0/16"
+```
+
+The following elements can be specified:
+
+- `id` - (Required) The existing AWS VPC ID `vpc-xxx`
+- `cidr` - If the VPC's CIDR is not the default `172.31.0.0/16` an alternative
+ CIDR can be specified here.
+
### provider
Defines where the cluster's resources are provisioned, as well as provider-specific configuration such as tags.
diff --git a/compose/aspnet-mssql-compose.md b/compose/aspnet-mssql-compose.md
index e3ab46a321..c9207fd5ef 100644
--- a/compose/aspnet-mssql-compose.md
+++ b/compose/aspnet-mssql-compose.md
@@ -6,7 +6,7 @@ title: "Quickstart: Compose and ASP.NET Core with SQL Server"
This quick-start guide demonstrates how to use Docker Engine on Linux and Docker
Compose to set up and run the sample ASP.NET Core application using the
-[.NET Core SDK image](hub.docker.com/_/microsoft-dotnet-core-sdk)
+[.NET Core SDK image](https://hub.docker.com/_/microsoft-dotnet-core-sdk)
with the
[SQL Server on Linux image](https://hub.docker.com/_/microsoft-mssql-server).
You just need to have [Docker Engine](/install/index.md)
@@ -112,7 +112,7 @@ configure this app to use our SQL Server database, and then create a
This file defines the `web` and `db` micro-services, their relationship, the
ports they are using, and their specific environment variables.
-
+
> **Note**: You may receive an error if you choose the wrong Compose file
> version. Be sure to choose a verison that is compatible with your system.
diff --git a/compose/bundles.md b/compose/bundles.md
index a4157c38ae..6dac5deacd 100644
--- a/compose/bundles.md
+++ b/compose/bundles.md
@@ -26,12 +26,6 @@ However, [swarm mode](/engine/swarm/index.md), multi-service applications, and
stack files now are fully supported. A stack file is a particular type of
[version 3 Compose file](/compose/compose-file/index.md).
-If you are just getting started with Docker and want to learn the best way to
-deploy multi-service applications, a good place to start is the [Get Started
-walkthrough](/get-started/). This shows you how to define
-a service configuration in a Compose file, deploy the app, and use
-the relevant tools and commands.
-
## Produce a bundle
The easiest way to produce a bundle is to generate it using `docker-compose`
@@ -212,8 +206,6 @@ A service has the following fields:
## Related topics
-* [Get started walkthrough](/get-started/)
-
* [docker stack deploy](/engine/reference/commandline/stack_deploy/) command
* [deploy](/compose/compose-file/index.md#deploy) option in [Compose files](/compose/compose-file/index.md)
diff --git a/compose/compose-file/compose-file-v2.md b/compose/compose-file/compose-file-v2.md
index d97b78d6c0..f7eedd892c 100644
--- a/compose/compose-file/compose-file-v2.md
+++ b/compose/compose-file/compose-file-v2.md
@@ -30,7 +30,7 @@ The default path for a Compose file is `./docker-compose.yml`.
>**Tip**: You can use either a `.yml` or `.yaml` extension for this file. They both work.
-A [container](/engine/reference/glossary.md#container) definition contains configuration which are applied to each
+A [container](/../../glossary.md#container) definition contains configuration which are applied to each
container started for that service, much like passing command-line parameters to
`docker run`. Likewise, network and volume definitions are analogous to
`docker network create` and `docker volume create`.
@@ -196,8 +196,8 @@ or a list:
args:
- buildno=1
- gitcommithash=cdc3b19
-
-> **Note**: In your Dockerfile, if you specify `ARG` before the `FROM` instruction,
+
+> **Note**: In your Dockerfile, if you specify `ARG` before the `FROM` instruction,
> If you need an argument to be available in both places, also specify it under the `FROM` instruction.
> See [Understand how ARGS and FROM interact](/engine/reference/builder/#understand-how-arg-and-from-interact) for usage details.
diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md
index 233e5e150b..9ac9ca2e89 100644
--- a/compose/compose-file/index.md
+++ b/compose/compose-file/index.md
@@ -2586,6 +2586,5 @@ stack.
- [User guide](/compose/index.md)
- [Installing Compose](/compose/install/)
- [Compose file versions and upgrading](compose-versioning.md)
-- [Get started with Docker](/get-started/)
- [Samples](/samples/)
- [Command line reference](/compose/reference/)
diff --git a/compose/index.md b/compose/index.md
index becf5b50aa..c2847bb97b 100644
--- a/compose/index.md
+++ b/compose/index.md
@@ -59,7 +59,6 @@ Compose has commands for managing the whole lifecycle of your application:
## Compose documentation
- [Installing Compose](install.md)
-- [Getting Started](gettingstarted.md)
- [Get started with Django](django.md)
- [Get started with Rails](rails.md)
- [Get started with WordPress](wordpress.md)
@@ -71,10 +70,10 @@ Compose has commands for managing the whole lifecycle of your application:
The features of Compose that make it effective are:
-* [Multiple isolated environments on a single host](overview.md#Multiple-isolated-environments-on-a-single-host)
-* [Preserve volume data when containers are created](overview.md#preserve-volume-data-when-containers-are-created)
-* [Only recreate containers that have changed](overview.md#only-recreate-containers-that-have-changed)
-* [Variables and moving a composition between environments](overview.md#variables-and-moving-a-composition-between-environments)
+* [Multiple isolated environments on a single host](#multiple-isolated-environments-on-a-single-host)
+* [Preserve volume data when containers are created](#preserve-volume-data-when-containers-are-created)
+* [Only recreate containers that have changed](#only-recreate-containers-that-have-changed)
+* [Variables and moving a composition between environments](#variables-and-moving-a-composition-between-environments)
### Multiple isolated environments on a single host
diff --git a/compose/reference/create.md b/compose/reference/create.md
index ceb2ef58a8..5776987215 100644
--- a/compose/reference/create.md
+++ b/compose/reference/create.md
@@ -5,9 +5,12 @@ title: docker-compose create
notoc: true
---
+> **This command is deprecated.** Use the [up](up.md) command with `--no-start`
+instead.
+{: .warning }
+
```
Creates containers for a service.
-This command is deprecated. Use the `up` command with `--no-start` instead.
Usage: create [options] [SERVICE...]
diff --git a/compose/reference/scale.md b/compose/reference/scale.md
index 2b71bde9e5..b0487e5ca0 100644
--- a/compose/reference/scale.md
+++ b/compose/reference/scale.md
@@ -5,10 +5,11 @@ title: docker-compose scale
notoc: true
---
-> **Note**: This command is deprecated. Use the [up](up.md) command with the
- `--scale` flag instead. Beware that using `up` with `--scale` flag has some
- [subtle differences](https://github.com/docker/compose/issues/5251) with the `scale` command as it incorporates the behaviour
- of `up` command.
+> **This command is deprecated.** Use the [up](up.md) command with the
+ `--scale` flag instead. Beware that using `up` with the `--scale` flag has
+ some [subtle differences](https://github.com/docker/compose/issues/5251) with
+ the `scale` command, as it incorporates the behaviour of the `up` command.
+ {: .warning }
```
Usage: scale [options] [SERVICE=NUM...]
diff --git a/compose/samples-for-compose.md b/compose/samples-for-compose.md
index 7ca71ad80e..019fddeede 100644
--- a/compose/samples-for-compose.md
+++ b/compose/samples-for-compose.md
@@ -31,14 +31,4 @@ Docker Compose to set up and run a Rails/PostgreSQL app.
- [Quickstart: Compose and WordPress](/compose/wordpress.md) - Shows how to
use Docker Compose to set up and run WordPress in an isolated environment
-with Docker containers.
-
-## Samples that include Compose in the workflows
-
-These samples include working with Docker Compose as part of broader learning
-goals:
-
-- [Get Started with Docker](/get-started/index.md) - This multi-part tutorial covers writing your first app, data storage, networking, and swarms,
-and ends with your app running on production servers in the cloud.
-
-- [Deploying an app to a Swarm](https://github.com/docker/labs/blob/master/beginner/chapters/votingapp.md) - This tutorial from [Docker Labs](https://github.com/docker/labs/blob/master/README.md) shows you how to create and customize a sample voting app, deploy it to a [swarm](/engine/swarm.md), test it, reconfigure the app, and redeploy.
+with Docker containers.
\ No newline at end of file
diff --git a/config/containers/logging/configure.md b/config/containers/logging/configure.md
index ddf7be4d91..fa8fc1b36f 100644
--- a/config/containers/logging/configure.md
+++ b/config/containers/logging/configure.md
@@ -50,7 +50,7 @@ example sets two configurable options on the `json-file` logging driver:
}
```
-> **Note**: `log-opt` configuration options in the `daemon.json` configuration
+> **Note**: `log-opts` configuration options in the `daemon.json` configuration
> file must be provided as strings. Boolean and numeric values (such as the value
> for `max-file` in the example above) must therefore be enclosed in quotes (`"`).
diff --git a/config/containers/logging/gelf.md b/config/containers/logging/gelf.md
index 49aa4f0aab..72b28191a6 100644
--- a/config/containers/logging/gelf.md
+++ b/config/containers/logging/gelf.md
@@ -80,7 +80,7 @@ The `gelf` logging driver supports the following options:
| Option | Required | Description | Example value |
| :------------------------- | :-------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------- |
| `gelf-address` | required | The address of the GELF server. `tcp` and `udp` are the only supported URI specifier and you must specify the port. | `--log-opt gelf-address=udp://192.168.0.42:12201` |
-| `gelf-compression-type` | optional | `UDP Only` The type of compression the GELF driver uses to compress each log message. Allowed values are `gzip`, `zlib` and `none`. The default is `gzip`. | `--log-opt gelf-compression-type=gzip` |
+| `gelf-compression-type` | optional | `UDP Only` The type of compression the GELF driver uses to compress each log message. Allowed values are `gzip`, `zlib` and `none`. The default is `gzip`. **Note that enabled compression leads to excessive CPU usage, so it is highly recommended to set this to `none`**. | `--log-opt gelf-compression-type=gzip` |
| `gelf-compression-level` | optional | `UDP Only` The level of compression when `gzip` or `zlib` is the `gelf-compression-type`. An integer in the range of `-1` to `9` (BestCompression). Default value is 1 (BestSpeed). Higher levels provide more compression at lower speed. Either `-1` or `0` disables compression. | `--log-opt gelf-compression-level=2` |
| `gelf-tcp-max-reconnect` | optional | `TCP Only` The maximum number of reconnection attempts when the connection drop. An positive integer. Default value is 3. | `--log-opt gelf-tcp-max-reconnect=3` |
| `gelf-tcp-reconnect-delay` | optional | `TCP Only` The number of seconds to wait between reconnection attempts. A positive integer. Default value is 1. | `--log-opt gelf-tcp-reconnect-delay=1` |
diff --git a/datacenter/dtr/2.0/configure/config-storage.md b/datacenter/dtr/2.0/configure/config-storage.md
index cff78332a1..480f48a574 100644
--- a/datacenter/dtr/2.0/configure/config-storage.md
+++ b/datacenter/dtr/2.0/configure/config-storage.md
@@ -176,7 +176,7 @@ YAML file (which is discussed further in this document.)
>**Note**: Changing your storage backend requires you to restart the Trusted Registry.
-See the [Registry configuration](/registry/configuration.md)
+See the [Docker Registry storage driver](/registry/storage-drivers/)
documentation for the full options specific to each driver. Storage drivers can
be customized through the [Docker Registry storage driver
API](/registry/storage-drivers/index.md#storage-driver-api).
@@ -184,21 +184,21 @@ API](/registry/storage-drivers/index.md#storage-driver-api).
### Filesystem settings
-The [filesystem storage backend](/registry/configuration.md#filesystem)
+The [filesystem storage backend](/registry/storage-drivers/filesystem)
has only one setting, the "Storage directory".
### S3 settings
-If you select the [S3 storage backend](/registry/configuration.md#s3), then you
+If you select the [S3 storage backend](/registry/storage-drivers/s3), then you
need to set "AWS region", "Bucket name", "Access Key", and "Secret Key".
### Azure settings
-Set the "Account name", "Account key", "Container", and "Realm" on the [Azure storage backend](/registry/configuration.md#azure) page.
+Set the "Account name", "Account key", "Container", and "Realm" on the [Azure storage backend](/registry/storage-drivers/azure) page.
### Openstack Swift settings
-View the [Openstack Swift settings](/registry/configuration.md#openstack-swift)
+View the [Openstack Swift settings](/registry/storage-drivers/openstack-swift)
documentation so that you can set up your storage settings: authurl, username,
password, container, tenant, tenantid, domain, domainid, insecureskipverify,
region, chunksize, and prefix.
@@ -230,4 +230,4 @@ ensure your choices make sense.
## See also
-* [Configure security settings](config-security.md)
\ No newline at end of file
+* [Configure security settings](config-security.md)
diff --git a/datacenter/dtr/2.1/guides/configure/configure-storage.md b/datacenter/dtr/2.1/guides/configure/configure-storage.md
index e3932d132d..2e12727d6b 100644
--- a/datacenter/dtr/2.1/guides/configure/configure-storage.md
+++ b/datacenter/dtr/2.1/guides/configure/configure-storage.md
@@ -60,7 +60,7 @@ adequate space available. To do so, you can run the following commands:
### Amazon S3
S3 stores data as objects within “buckets” where you read, write, and delete
-objects in that container. It too, has a `rootdirectory` parameter. If you select this option, there will be some tasks that you need to first perform [on AWS](https://aws.amazon.com/s3/getting-started/).
+objects in that container. It too, has a `rootdirectory` parameter. If you select this option, there will be some tasks that you need to first perform [on AWS](https://aws.amazon.com/s3/getting-started/).
1. You must create an S3 bucket, and write down its name and the AWS zone it
runs on.
@@ -155,7 +155,7 @@ YAML file (which is discussed further in this document.)
>**Note**: Changing your storage backend requires you to restart the Trusted Registry.
-See the [Registry configuration](/registry/configuration.md)
+See the [Docker Registry storage driver](/registry/storage-drivers/)
documentation for the full options specific to each driver. Storage drivers can
be customized through the [Docker Registry storage driver
API](/registry/storage-drivers/index.md#storage-driver-api).
@@ -163,21 +163,21 @@ API](/registry/storage-drivers/index.md#storage-driver-api).
### Filesystem settings
-The [filesystem storage backend](/registry/configuration.md#filesystem)
+The [filesystem storage backend](/registry/storage-drivers/filesystem)
has only one setting, the "Storage directory".
### S3 settings
-If you select the [S3 storage backend](/registry/configuration.md#s3), then you
+If you select the [S3 storage backend](/registry/storage-drivers/s3), then you
need to set "AWS region", "Bucket name", "Access Key", and "Secret Key".
### Azure settings
-Set the "Account name", "Account key", "Container", and "Realm" on the [Azure storage backend](/registry/configuration.md#azure) page.
+Set the "Account name", "Account key", "Container", and "Realm" on the [Azure storage backend](/registry/storage-drivers/azure) page.
### Openstack Swift settings
-View the [Openstack Swift settings](/registry/configuration.md#openstack-swift)
+View the [Openstack Swift settings](/registry/storage-drivers/openstack-swift)
documentation so that you can set up your storage settings: authurl, username,
password, container, tenant, tenantid, domain, domainid, insecureskipverify,
region, chunksize, and prefix.
diff --git a/datacenter/dtr/2.6/guides/admin/install/index.md b/datacenter/dtr/2.6/guides/admin/install/index.md
index 779a009003..9f573480fb 100644
--- a/datacenter/dtr/2.6/guides/admin/install/index.md
+++ b/datacenter/dtr/2.6/guides/admin/install/index.md
@@ -49,14 +49,14 @@ You can run that snippet on any node where Docker is installed. As an example
you can SSH into a UCP node and run the DTR installer from there. By default
the installer runs in interactive mode and prompts you for any additional
information that is necessary.
-[Learn more about the installer](/reference/dtr/2.6/cli/install/).
+[Learn more about the installer](/v18.09/reference/dtr/2.6/cli/install/).
By default DTR is deployed with self-signed certificates, so your UCP deployment
might not be able to pull images from DTR.
Use the `--dtr-external-url :` optional flag while deploying
DTR, so that UCP is automatically reconfigured to trust DTR. Since [HSTS (HTTP Strict-Transport-Security)
-header](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) is included in all API responses,
-make sure to specify the FQDN (Fully Qualified Domain Name) of your DTR, or your browser may refuse
+header](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) is included in all API responses,
+make sure to specify the FQDN (Fully Qualified Domain Name) of your DTR, or your browser may refuse
to load the web interface.
## Step 4. Check that DTR is running
@@ -125,13 +125,13 @@ To add replicas to a DTR cluster, use the `docker/dtr join` command:
--ucp-node \
--ucp-insecure-tls
```
-
+
> --ucp-node
>
> The following the --ucp-node flag is the target node to
> install the DTR replica. This is NOT the UCP Manager URL.
{: .important}
-
+
3. Check that all replicas are running.
In your browser, navigate to the Docker **Universal Control Plane**
diff --git a/develop/dev-best-practices.md b/develop/dev-best-practices.md
index 8643755396..237f2923ef 100644
--- a/develop/dev-best-practices.md
+++ b/develop/dev-best-practices.md
@@ -78,34 +78,6 @@ keep image size small:
standalone containers, consider migrating to use single-replica services, so
that you can take advantage of these service-only features.
-## Use swarm services when possible
-
-- When possible, design your application with the ability to scale using swarm
- services.
-- Even if you only need to run a single instance of your application, swarm
- services provide several advantages over standalone containers. A service's
- configuration is declarative, and Docker is always working to keep the
- desired and actual state in sync.
-- Networks and volumes can be connected and disconnected from swarm services,
- and Docker handles redeploying the individual service containers in a
- non-disruptive way. Standalone containers need to be manually stopped, removed,
- and recreated to accommodate configuration changes.
-- Several features, such as the ability to store
- [secrets](/engine/swarm/secrets.md) and [configs](/engine/swarm/configs.md),
- are only available to services rather than standalone containers. These
- features allow you to keep your images as generic as possible and to avoid
- storing sensitive data within the Docker images or containers themselves.
-- Let `docker stack deploy` handle any image pulls for you, instead of using
- `docker pull`. This way, your deployment doesn't try to pull from nodes
- that are down. Also, when new nodes are added to the swarm, images are
- pulled automatically.
-
-There are limitations around sharing data amongst nodes of a swarm service.
-If you use [Docker for AWS](/docker-for-aws/persistent-data-volumes.md) or
-[Docker for Azure](/docker-for-azure/persistent-data-volumes.md), you can use the
-Cloudstor plugin to share data amongst your swarm service nodes. You can also
-write your application data into a separate database which supports simultaneous
-updates.
## Use CI/CD for testing and deployment
diff --git a/develop/develop-images/baseimages.md b/develop/develop-images/baseimages.md
index 4f6f37b61f..f23a90b779 100644
--- a/develop/develop-images/baseimages.md
+++ b/develop/develop-images/baseimages.md
@@ -11,13 +11,13 @@ Most Dockerfiles start from a parent image. If you need to completely control
the contents of your image, you might need to create a base image instead.
Here's the difference:
-- A [parent image](/glossary.md?term=parent%20image) is the image that your
+- A [parent image](/glossary.md#parent_image) is the image that your
image is based on. It refers to the contents of the `FROM` directive in the
Dockerfile. Each subsequent declaration in the Dockerfile modifies this parent
image. Most Dockerfiles start from a parent image, rather than a base image.
However, the terms are sometimes used interchangeably.
-- A [base image](/glossary.md?term=base%20image) has `FROM scratch` in its Dockerfile.
+- A [base image](/glossary.md#base_image) has `FROM scratch` in its Dockerfile.
This topic shows you several ways to create a base image. The specific process
will depend heavily on the Linux distribution you want to package. We have some
diff --git a/docker-for-mac/edge-release-notes.md b/docker-for-mac/edge-release-notes.md
index 642c300414..d486d961a0 100644
--- a/docker-for-mac/edge-release-notes.md
+++ b/docker-for-mac/edge-release-notes.md
@@ -12,6 +12,25 @@ notes](release-notes). For Docker Desktop system requirements, see
## Edge Releases of 2019
+### Docker Desktop Community 2.1.6.0
+2019-11-18
+
+[Download](https://download.docker.com/mac/edge/40807/Docker.dmg)
+
+### Upgrades
+
+- [Docker 19.03.5](https://github.com/docker/docker-ce/releases/tag/v19.03.5)
+- [Go 1.12.13](https://golang.org/doc/devel/release.html#go1.12)
+
+### New
+
+Added the ability to start and stop Compose-based applications and view combined logs in the Docker Desktop **Dashboard** UI.
+
+### Bug fixes and minor changes
+
+- Fixed port forwarding when containers are using `overlay` networks.
+- Fixed a container start error when a container has more than one port with an arbitrary or not-yet-configured external port number. For example, `docker run -p 80 -p 443 nginx`. Fixes [docker/for-win#4935](https://github.com/docker/for-win/issues/4935) and [docker/compose#6998](https://github.com/docker/compose/issues/6998).
+
### Docker Desktop Community 2.1.5.0
2019-11-04
@@ -58,6 +77,7 @@ Fixed an issue that caused VMs running on older hardware with macOS Catalina to
- Improved the navigation in **Settings** and **Troubleshoot** UI.
- Fixed a bug in the UEFI boot menu that sometimes caused Docker Desktop to hang during restart. Fixes [docker/for-mac#2655](https://github.com/docker/for-mac/issues/2655) and [docker/for-mac#3921](https://github.com/docker/for-mac/issues/3921).
- Docker Desktop now allows users to access the host’s SSH agent inside containers. Fixes [docker/for-mac#410](https://github.com/docker/for-mac/issues/410)
+- Docker Machine is no longer included in the Docker Desktop installer. You can download it separately from the [Docker Machine releases](https://github.com/docker/machine/releases) page.
### Docker Desktop Community 2.1.3.0
2019-09-16
diff --git a/docker-for-mac/index.md b/docker-for-mac/index.md
index 8cde852f80..75174182c7 100644
--- a/docker-for-mac/index.md
+++ b/docker-for-mac/index.md
@@ -31,12 +31,6 @@ running different versions.
```shell
$ docker --version
Docker version {{ site.docker_ce_version }}, build c97c6d6
-
-$ docker-compose --version
-docker-compose version {{ site.compose_version }}, build 8dd22a9
-
-$ docker-machine --version
-docker-machine version {{ site.machine_version }}, build 9ba6da9
```
## Explore the application
@@ -531,4 +525,4 @@ After you have successfully authenticated, you can access your organizations and
* Check out the blog post, [What’s New in Docker 17.06 Community Edition
(CE)](https://blog.docker.com/2017/07/whats-new-docker-17-06-community-edition-ce/){:
- target="_blank" class="_"}.
+ target="_blank" class="_"}.
\ No newline at end of file
diff --git a/docker-for-mac/install.md b/docker-for-mac/install.md
index f75cef3b79..35dfd29c55 100644
--- a/docker-for-mac/install.md
+++ b/docker-for-mac/install.md
@@ -122,4 +122,4 @@ For information on how to back up and restore data volumes, see [Backup, restore
- [Release notes](release-notes.md) lists component updates, new features, and
improvements associated with Stable releases. For information about Edge releases, see [Edge release
notes](edge-release-notes.md).
-- [Get started with Docker](/get-started/) provides a general Docker tutorial.
+- [Get started with Docker](/get-started/) provides a general Docker tutorial.
\ No newline at end of file
diff --git a/docker-for-mac/release-notes.md b/docker-for-mac/release-notes.md
index 75bf228dd4..14fa25f767 100644
--- a/docker-for-mac/release-notes.md
+++ b/docker-for-mac/release-notes.md
@@ -8,28 +8,32 @@ toc_min: 1
toc_max: 2
---
-Here are the main improvements and issues per stable release, starting with the
-current release. The documentation is updated for each release.
+This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop Stable releases.
-For system requirements, see
+For information about Edge releases, see the [Edge release notes](edge-release-notes). For Docker Desktop system requirements, see
[What to know before you install](install.md#what-to-know-before-you-install).
-Release notes for _stable_ releases are listed below, [_edge_ release
-notes](edge-release-notes) are also available. (Following the Docker Engine - Community release model,
-'beta' releases are called 'edge' releases.) You can learn about both kinds of
-releases, and download stable and edge product installers at [Download Docker
-Desktop for Mac](install.md#download-docker-for-mac).
-
## Stable Releases of 2019
-## Docker Desktop Community 2.1.0.4
-2019-10-21
+## Docker Desktop Community 2.1.0.5
+2019-11-18
> [Download](https://hub.docker.com/?overlay=onboarding)
>
> You must sign in to Docker Hub to download Docker Desktop.
-Docker Desktop 2.1.0.4 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version.
+Docker Desktop 2.1.0.5 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version.
+
+### Upgrades
+
+- [Docker 19.03.5](https://github.com/docker/docker-ce/releases/tag/v19.03.5)
+- [Kubernetes 1.14.8](https://github.com/kubernetes/kubernetes/releases/tag/v1.14.8)
+- [Go 1.12.13](https://golang.org/doc/devel/release.html#go1.12)
+
+## Docker Desktop Community 2.1.0.4
+2019-10-21
+
+[Download](https://download.docker.com/mac/stable/39773/Docker.dmg)
### Upgrades
@@ -791,4 +795,4 @@ events or unexpected unmounts.
* Docker 1.12.0
* Docker Machine 0.8.0
-* Docker Compose 1.8.0
+* Docker Compose 1.8.0
\ No newline at end of file
diff --git a/docker-for-windows/edge-release-notes.md b/docker-for-windows/edge-release-notes.md
index 1aff2e1ed7..3874a4b596 100644
--- a/docker-for-windows/edge-release-notes.md
+++ b/docker-for-windows/edge-release-notes.md
@@ -12,6 +12,52 @@ notes](release-notes). For Docker Desktop system requirements, see
## Edge Releases of 2019
+### Docker Desktop Community 2.1.6.1
+2019-11-20
+
+[Download](https://download.docker.com/win/edge/40920/Docker%20Desktop%20Installer.exe)
+
+### Bug fixes and minor changes
+
+- Fixed an issue that prevented Kubernetes to start with WSL 2 on machines with multiple CPU cores.
+- Fixed a rare issue that caused to Docker Desktop to crash with the error `Unable to stop Hyper-V VM: Cannot validate argument on parameter 'SwitchName'. The argument is null or empty.`
+
+### Known issue
+
+Windows Insider Preview Slow Ring users cannot run WSL 2 after upgrading to Docker Desktop Edge 2.1.6.1 release as WSL 2 requires Windows 10 Insider Preview build 19018 or higher.
+
+### Docker Desktop Community 2.1.6.0
+2019-11-18
+
+[Download](https://download.docker.com/win/edge/40807/Docker%20Desktop%20Installer.exe)
+
+### Upgrades
+
+- [Docker 19.03.5](https://github.com/docker/docker-ce/releases/tag/v19.03.5)
+- [Go 1.12.13](https://golang.org/doc/devel/release.html#go1.12)
+
+### New
+
+Added the ability to start and stop Compose-based applications and view combined logs in the Docker Desktop **Dashboard** UI.
+
+### Bug fixes and minor changes
+
+- Docker Desktop now automatically restarts after an update.
+- Fixed an issue where Docker Desktop auto-start was not being disabled properly on some machines.
+- Fixed a container start error when a container has more than one port with an arbitrary or not-yet-configured external port number. For example, `docker run -p 80 -p 443 nginx`). Fixes [docker/for-win#4935](https://github.com/docker/for-win/issues/4935) and [docker/compose#6998](https://github.com/docker/compose/issues/6998).
+- Fixed an issue which caused Docker Desktop to crash when resetting to factory defaults while running Windows containers.
+- Fixed multiple issues related to Fast Startup.
+- Injected Docker CLI, CLI plugins, Docker Compose, Notary, and kubectl into WSL distros when Docker Desktop WSL integration is enabled.
+- Fixed an issue where bind mounts created with Docker Compose from a WSL distro were incorrectly translated. Fixes [docker/for-win#5084](https://github.com/docker/for-win/issues/5084).
+- Docker Desktop now supports inotify events on shared filesystems for Windows file sharing.
+- Fixed a cache invalidation bug when a file in a shared volume is renamed on the host for Windows file sharing.
+- Fixed a handle leak when calling `Mknod` on a shared volume for Windows file sharing.
+- To make VM startup more reliable, Docker Desktop now avoids adding a Hyper-V NIC to the Windows VM when using Hypervisor sockets for Windows file sharing (rather than Samba).
+
+### Known issue
+
+Windows Insider Preview Slow Ring users cannot run WSL 2 after upgrading to Docker Desktop Edge 2.1.6.0 release as WSL 2 requires Windows 10 Insider Preview build 19018 or higher.
+
### Docker Desktop Community 2.1.5.0
2019-11-04
@@ -31,7 +77,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
To access the Dashboard UI, select the Docker menu from the system tray and then click **Dashboard**.
-- **WSL 2 backend:** The new Docker Desktop WSL 2 backend replaces the Docker Desktop WSL 2 Tech Preview. The WSL 2 backend architecture introduces support for Kubernetes, provides an updated Docker daemon, offers VPN-friendly networking, and additional features. For more information, see [Docker Desktop WSL 2 backend](https://engineering.docker.com/2019/10/new-docker-desktop-wsl2-backend/).
+- **WSL 2 backend:** The new Docker Desktop WSL 2 backend replaces the Docker Desktop WSL 2 Tech Preview. The WSL 2 backend architecture introduces support for Kubernetes, provides an updated Docker daemon, offers VPN-friendly networking, and additional features. For more information, see [Docker Desktop WSL 2 backend](https://docs.docker.com/docker-for-windows/wsl-tech-preview/).
- **New file sharing implementation:** Docker Desktop introduces a new file sharing implementation which uses gRPC, FUSE, and Hypervisor sockets instead of Samba, CIFS, and Hyper-V networking. The new implementation offers improved I/O performance. Additionally, when using the new file system:
@@ -64,6 +110,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
- Improved the navigation in **Settings** and **Troubleshoot** UI.
- Fixed a bug that prevented users from accessing WSL 2 Tech Preview. Fixes [docker/for-win#4734](https://github.com/docker/for-win/issues/4734).
+- Docker Machine is no longer included in the Docker Desktop installer. You can download it separately from the [Docker Machine releases](https://github.com/docker/machine/releases) page.
### Docker Desktop Community 2.1.3.0
2019-09-16
diff --git a/docker-for-windows/images/wsl2-choose-distro.png b/docker-for-windows/images/wsl2-choose-distro.png
new file mode 100644
index 0000000000..cd161add00
Binary files /dev/null and b/docker-for-windows/images/wsl2-choose-distro.png differ
diff --git a/docker-for-windows/images/wsl2-enable.png b/docker-for-windows/images/wsl2-enable.png
new file mode 100644
index 0000000000..f8ca7e6c27
Binary files /dev/null and b/docker-for-windows/images/wsl2-enable.png differ
diff --git a/docker-for-windows/index.md b/docker-for-windows/index.md
index ff4a110466..968046d2b1 100644
--- a/docker-for-windows/index.md
+++ b/docker-for-windows/index.md
@@ -39,22 +39,15 @@ See [Install Docker Desktop](install.md){: target="_blank" class="_"} for downlo
> docker run hello-world
docker : Unable to find image 'hello-world:latest' locally
- ...
-
- latest:
- Pulling from library/hello-world
- ca4f61b1923c:
- Pulling fs layer
- ca4f61b1923c:
- Download complete
- ca4f61b1923c:
- Pull complete
- Digest: sha256:97ce6fa4b6cdc0790cda65fe7290b74cfebd9fa0c9b8c38e979330d547d22ce1
+ latest: Pulling from library/hello-world
+ 1b930d010525: Pull complete
+ Digest: sha256:c3b4ada4687bbaa170745b3e4dd8ac3f194ca95b2d0518b417fb47e5879d9b5f
Status: Downloaded newer image for hello-world:latest
Hello from Docker!
This message shows that your installation appears to be working correctly.
...
+
```
4. List the `hello-world` _image_ that was downloaded from Docker Hub:
@@ -89,18 +82,12 @@ running something more complex, such as an OS and a webserver.
> docker run --interactive --tty ubuntu bash
docker : Unable to find image 'ubuntu:latest' locally
- ...
-
- latest:
- Pulling from library/ubuntu
- 22dc81ace0ea:
- Pulling fs layer
- 1a8b3c87dba3:
- Pulling fs layer
- 91390a1c435a:
- Pulling fs layer
- ...
- Digest: sha256:e348fbbea0e0a0e73ab0370de151e7800684445c509d46195aef73e090a49bd6
+ latest: Pulling from library/ubuntu
+ 22e816666fd6: Pull complete
+ 079b6d2a1e53: Pull complete
+ 11048ebae908: Pull complete
+ c58094023a2e: Pull complete
+ Digest: sha256:a7b8b7b33e44b123d7f997bd4d3d0a59fafc63e203d17efedf09ff3f6f516152
Status: Downloaded newer image for ubuntu:latest
```
diff --git a/docker-for-windows/release-notes.md b/docker-for-windows/release-notes.md
index adf8e36255..2d424ff27e 100644
--- a/docker-for-windows/release-notes.md
+++ b/docker-for-windows/release-notes.md
@@ -8,27 +8,33 @@ toc_min: 1
toc_max: 2
---
-Here are the main improvements and issues per stable release, starting with the
-current release. The documentation is always updated for each release.
+This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop Stable releases.
-For system requirements, see
+For information about Edge releases, see the [Edge release notes](edge-release-notes). For Docker Desktop system requirements, see
[What to know before you install](install.md#what-to-know-before-you-install).
-Release notes for _stable_ releases are listed below, [_edge_ release
-notes](edge-release-notes) are also available. (Following the Docker Engine - Community release model,
-'beta' releases are called 'edge' releases.) You can learn about both kinds of
-releases, and download stable and edge product installers at [Download Docker
-for Windows](install.md#download-docker-for-windows).
-
## Stable Releases of 2019
-## Docker Desktop Community 2.1.0.4
-2019-10-21
+## Docker Desktop Community 2.1.0.5
+2019-11-18
> [Download](https://hub.docker.com/?overlay=onboarding)
>
> You must sign in to Docker Hub to download Docker Desktop.
+Docker Desktop 2.1.0.5 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version.
+
+### Upgrades
+
+- [Docker 19.03.5](https://github.com/docker/docker-ce/releases/tag/v19.03.5)
+- [Kubernetes 1.14.8](https://github.com/kubernetes/kubernetes/releases/tag/v1.14.8)
+- [Go 1.12.13](https://golang.org/doc/devel/release.html#go1.12)
+
+## Docker Desktop Community 2.1.0.4
+2019-10-21
+
+[Download](https://download.docker.com/win/stable/39773/Docker%20Desktop%20Installer.exe)
+
Docker Desktop 2.1.0.4 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version.
### Upgrades
@@ -775,4 +781,4 @@ We did not distribute a 1.12.4 stable release
* Docker 1.12.0
* Docker Machine 0.8.0
-* Docker Compose 1.8.0
+* Docker Compose 1.8.0
\ No newline at end of file
diff --git a/docker-for-windows/wsl-tech-preview.md b/docker-for-windows/wsl-tech-preview.md
index 2db1878208..a4f9774290 100644
--- a/docker-for-windows/wsl-tech-preview.md
+++ b/docker-for-windows/wsl-tech-preview.md
@@ -1,31 +1,45 @@
---
-description: Docker Desktop WSL 2 Tech Preview
-keywords: Docker, WSL, WSL 2, Tech Preview, Windows Subsystem for Linux
-title: Docker Desktop WSL 2 Tech Preview
+description: Docker Desktop WSL 2 backend
+keywords: WSL, WSL 2 Tech Preview, Windows Subsystem for Linux
+title: Docker Desktop WSL 2 backend
toc_min: 1
toc_max: 2
---
-# Overview
+The new Docker Desktop WSL 2 backend replaces the Docker Desktop WSL 2 Tech Preview. The WSL 2 backend architecture introduces support for Kubernetes, provides an updated Docker daemon, offers VPN-friendly networking, and additional features.
-Welcome to Docker Desktop WSL 2 Tech Preview. This Tech Preview introduces support to run Docker Desktop with WSL 2. We really appreciate you trialing this Tech Preview. Your feedback is very important to us. Please let us know your feedback by creating an issue in the [Docker Desktop for Windows GitHub](https://github.com/docker/for-win/issues) repository and adding the **WSL 2** label.
+WSL 2 introduces a significant architectural change as it is a full Linux kernel built by Microsoft, allowing Linux containers to run natively without emulation. With Docker Desktop running on WSL 2, users can leverageLinux workspaces and avoid having to maintain both Linux and Windows build scripts.
-WSL 2 introduces a significant architectural change as it is a full Linux kernel built by Microsoft, allowing Linux containers to run natively without emulation. With Docker Desktop WSL 2 Tech Preview, users can access Linux workspaces without having to maintain both Linux and Windows build scripts.
-
-Docker Desktop also leverages the dynamic memory allocation feature in WSL 2 to greatly improve the resource consumption. This means, Docker Desktop only uses the required amount of CPU and memory resources, enabling CPU and memory-intensive tasks such as building a container to run much faster.
+Docker Desktop also leverages the dynamic memory allocation feature in WSL 2 to greatly improve the resource consumption. This means, Docker Desktop only uses the required amount of CPU and memory resources it needs, while enabling CPU and memory-intensive tasks such as building a container to run much faster.
Additionally, with WSL 2, the time required to start a Docker daemon after a cold start is significantly faster. It takes less than 2 seconds to start the Docker daemon when compared to tens of seconds in the current version of Docker Desktop.
-> Note that it is currently not possible to run Kubernetes while running Docker Desktop on WSL 2. However, you can continue to use Kubernetes in the non-WSL 2 Docker Desktop using the Daemon **Settings** option.
+ Your feedback is very important to us. Please let us know your feedback by creating an issue in the [Docker Desktop for Windows GitHub](https://github.com/docker/for-win/issues) repository and adding the **WSL 2** label.
# Prerequisites
-Before you install Docker Desktop WSL 2 Tech Preview, you must complete the following steps:
+Before you install Docker Desktop WSL 2 backend, you must complete the following steps:
-1. Install Windows 10 Insider Preview build 18932 or later.
+1. Install Windows 10 Insider Preview build 19018 or higher.
2. Enable WSL 2 feature on Windows. For detailed instructions, refer to the [Microsoft documentation](https://docs.microsoft.com/en-us/windows/wsl/wsl2-install).
-3. Install a default distribution based on Ubuntu 18.04. You can check this with `wsl lsb_release -a`. You can download Ubuntu 18.04 from the [Microsoft store](https://www.microsoft.com/en-us/p/ubuntu-1804-lts/9n9tngvndl3q).
-4. Ensure the Ubuntu distribution runs in WSL 2 mode. WSL can run distributions in both v1 or v2 mode.
+
+# Download
+
+Download [Docker Desktop Edge 2.1.6.0](https://download.docker.com/win/edge/40807/Docker%20Desktop%20Installer.exe) or a later release.
+
+# Install
+
+Ensure you have completed the steps described in the Prerequisites section **before** installing the Docker Desktop Edge release.
+
+1. Follow the usual Docker Desktop installation instructions to install Docker Desktop.
+2. Start Docker Desktop from the Windows Start menu.
+3. From the Docker menu, select **Settings** > **General**.
+
+ 
+
+4. Select the **Enable the experimental WSL 2 based engine** check box.
+5. Click **Apply & Restart**.
+6. Ensure the distribution runs in WSL 2 mode. WSL can run distributions in both v1 or v2 mode.
To check the WSL mode, run:
@@ -34,24 +48,8 @@ Before you install Docker Desktop WSL 2 Tech Preview, you must complete the foll
To upgrade to v2, run:
`wsl --set-version 2`
-5. Set Ubuntu 18.04 as the default distribution.
+7. When Docker Desktop restarts, go to **Settings** > **Resources** > **WSL Integration** and then select from which WSL 2 distributions you would like to access Docker.
- `wsl -s ubuntu 18.04`
+ 
-# Download
-
-To download the Tech Preview, click [Docker Desktop WSL 2 Tech Preview Installer](https://download.docker.com/win/edge/36883/Docker%20Desktop%20Installer.exe).
-
-# Installation
-
-Ensure you have completed the steps described in the Prerequisites section **before** installing the Tech Preview.
-
-Follow the usual Docker Desktop installation instructions to install the Tech Preview. After a successful installation, the Docker Desktop menu displays the **WSL 2 Tech Preview** option.
-
-
-
-Select **WSL 2 Tech Preview** from the menu to start, stop, and configure the daemon running in WSL 2. When the WSL 2 daemon starts, a docker CLI context is automatically created for it, and the CLI configuration points to the context. You can list contexts by running `docker context ls`.
-
-
-
-Docker Desktop allows you to toggle between the WSL modes. To use the classic daemon, run `docker context use default`. To switch to WSL 2, run `docker context use wsl`.
+8. Click **Apply & Restart** for the changes to take effect.
diff --git a/docker-hub/access-tokens.md b/docker-hub/access-tokens.md
index 685bb34355..080b5ae0aa 100644
--- a/docker-hub/access-tokens.md
+++ b/docker-hub/access-tokens.md
@@ -65,4 +65,4 @@ a password, enter your token instead.
If you have 2FA enabled, you must use a personal access token when logging in
from the Docker CLI. If you don't have it enabled, this is an optional (but
-more secure) method of authentication.
+more secure) method of authentication.
\ No newline at end of file
diff --git a/docker-hub/builds/classic.md b/docker-hub/builds/classic.md
deleted file mode 100644
index 994578f0aa..0000000000
--- a/docker-hub/builds/classic.md
+++ /dev/null
@@ -1,90 +0,0 @@
----
-description: Explains the difference between Classic and new Automated Builds
-keywords: automated, build, images
-title: Classic Automated Builds
----
-
-With the launch of the new Docker Hub, we are introducing an improved Automated Build experience.
-
-Automated Builds created using an older version of Docker Hub are now labelled "Classic".
-If you were using Docker Cloud to manage builds, your builds are already the latest version of Automated Builds.
-
-All automated builds created going forward will get the new experience. If you are creating a new
-Automated Build for the first time, see [docs](/docker-hub/builds.md#configure-automated-build-settings).
-
-In the coming months, we will gradually convert Classic Automated Builds into new Automated Builds. This should
-be a seamless process for most users.
-
-
-## Managing Classic Automated Builds
-
-You can manage both Classic and new Automated Builds from the **Builds** tab
-
-Repository with Classic Automated Build:
-
-
-
- Build settings can be configured similarly to those on the old Docker Hub.
-
-If you have previously created an automated build in both the old Docker Hub and Docker Cloud, you can switch between
-Classic and new Automated Builds.
-
-New Automated Build is displayed by default. You can switch to Classic Automated Build by clicking on this link at the top
-
-
-
-Likewise, you can switch back to new Automated Build by clicking on this link at the top
-
-
-
-
-
-## Adding Github webhook manually
-
-A GitHub webhook allows GitHub to notify Docker Hub when something has
-been committed to a given Git repository.
-
-When you create a Classic Automated Build, a webhook should get automatically added to your GitHub
-repository.
-
-To add, confirm, or modify the webhook, log in to GitHub, then navigate to
-the repository. Within the repository, select **Settings > Webhooks**.
-You must have admin privileges on the repository to view or modify
-this setting. Click **Add webhook**, and use the following settings:
-
-
-| Field | Value |
-| ------|------ |
-| Payload URL | https://registry.hub.docker.com/hooks/github |
-| Content type | application/json |
-| Which events would you like to trigger this webhook? | Just the push event |
-| Active | checked |
-
-The image below shows the **Webhooks/Add webhook** form with the above settings reflected:
-
-
-
-If configured correctly, you'll see this in the **Webhooks** view
-
-
-
-
-## Frequently Asked Questions
-
-
-**Q: I've previously linked my GitHub/Bitbucket account in the old Docker Hub. Why do I need to re-link it?**
-
-A: The new Docker Hub uses a different permissions model. [Linking is only a few clicks by going to account settings](link-source.md).
-with the new Docker Hub.
-
- > **Note**: If you are linking a source code provider to create autobuilds for a team, follow the instructions to [create a service account](/docker-hub/builds.md#service-users-for-team-autobuilds) for the team before linking the account as described below.
-
-**Q: What happens to automated builds I created in the old Docker Hub?**
-
-A: They are now Classic Automated Builds. There are no functional differences with the old automated builds and everything
-(build triggers, existing build rules) should continue to work seamlessly.
-
-**Q: Is it possible to convert an existing Classic Automated Build?**
-
-A: This is currently unsupported. However, we are working to transition all builds into new experience in
-the coming months.
diff --git a/docker-hub/builds/images/authorize-builder.png b/docker-hub/builds/images/authorize-builder.png
new file mode 100644
index 0000000000..2e741d8e63
Binary files /dev/null and b/docker-hub/builds/images/authorize-builder.png differ
diff --git a/docker-hub/builds/images/index-active.png b/docker-hub/builds/images/index-active.png
index bd516a89e8..cb7ed20dc2 100644
Binary files a/docker-hub/builds/images/index-active.png and b/docker-hub/builds/images/index-active.png differ
diff --git a/docker-hub/builds/images/index-dashboard.png b/docker-hub/builds/images/index-dashboard.png
index 6ed32f34fc..a97dd5de6d 100644
Binary files a/docker-hub/builds/images/index-dashboard.png and b/docker-hub/builds/images/index-dashboard.png differ
diff --git a/docker-hub/builds/images/index-report.png b/docker-hub/builds/images/index-report.png
index be60eda263..03b7c4a423 100644
Binary files a/docker-hub/builds/images/index-report.png and b/docker-hub/builds/images/index-report.png differ
diff --git a/docker-hub/builds/images/linked-accounts.png b/docker-hub/builds/images/linked-accounts.png
new file mode 100644
index 0000000000..d219db3af3
Binary files /dev/null and b/docker-hub/builds/images/linked-accounts.png differ
diff --git a/docker-hub/builds/images/retry-build.png b/docker-hub/builds/images/retry-build.png
index cae3d9de70..11fa6c97fc 100644
Binary files a/docker-hub/builds/images/retry-build.png and b/docker-hub/builds/images/retry-build.png differ
diff --git a/docker-hub/builds/index.md b/docker-hub/builds/index.md
index 4e15af7293..bbf8efc28c 100644
--- a/docker-hub/builds/index.md
+++ b/docker-hub/builds/index.md
@@ -1,12 +1,13 @@
---
-description: Set up Automated builds
-keywords: automated, build, images
+description: Set up automated builds
+keywords: automated, build, images, Docker Hub
redirect_from:
- /docker-hub/builds/automated-build/
- /docker-cloud/feature-reference/automated-build/
- /docker-cloud/builds/automated-build/
- /docker-cloud/builds/
-title: Set up Automated builds
+- /docker-hub/builds/classic/
+title: Set up automated builds
---
@@ -268,22 +269,9 @@ You can specify a regular expression (regex) so that only matching branches or
tags are built. You can also use the results of the regex to create the Docker
tag that is applied to the built image.
-You can use the variable `{sourceref}` to use the branch or tag name that
-matched the regex in the Docker tag applied to the resulting built image. (The
-variable includes the whole source name, not just the portion that matched the
-regex.) You can also use up to nine regular expression capture groups
+You can use up to nine regular expression capture groups
(expressions enclosed in parentheses) to select a source to build, and reference
-these in the Docker Tag field using `{\1}` through `{\9}`.
-
-**Regex example: build from version number branch and tag with version number**
-
-You might want to automatically build any branches that end with a number
-formatted like a version number, and tag their resulting Docker images using a
-name that incorporates that branch name.
-
-To do this, specify a `branch` build with the regex `/[0-9.]+$/` in the
-**Source** field, and use the formula `version-{sourceref}` in the **Docker
-tag** field.
+these in the **Docker Tag** field using `{\1}` through `{\9}`.
+
+
+
+
+
+
+
+
A native application using the macOS sandbox security model which delivers all Docker tools to your Mac.
+
+
+
+
+
+
+
+
+
A native Windows application which delivers all Docker tools to your Windows computer.
+
+
+
+
+
+
+
+
+
Install Docker on a computer which already has a Linux distribution installed.
+
+
+
+
diff --git a/get-started/index.md b/get-started/index.md
index 6b0c5453d9..466e9d7fba 100644
--- a/get-started/index.md
+++ b/get-started/index.md
@@ -1,5 +1,5 @@
---
-title: "Get Started, Part 1: Orientation and setup"
+title: "Orientation and setup"
keywords: get started, setup, orientation, quickstart, intro, concepts, containers, docker desktop
description: Get oriented on some basics of Docker and install Docker Desktop.
redirect_from:
diff --git a/get-started/nav.html b/get-started/nav.html
index 31d302be0a..15ae009d17 100644
--- a/get-started/nav.html
+++ b/get-started/nav.html
@@ -1,7 +1,7 @@
diff --git a/get-started/part2.md b/get-started/part2.md
index ef6d2af6b2..69bc08ae3b 100644
--- a/get-started/part2.md
+++ b/get-started/part2.md
@@ -1,5 +1,5 @@
---
-title: "Get Started, Part 2: Containerizing an Application"
+title: "Containerizing an application"
keywords: containers, images, dockerfiles, node, code, coding, build, push, run
description: Learn how to create a Docker image by writing a Dockerfile, and use it to run a simple container.
---
@@ -25,7 +25,7 @@ In this stage of the tutorial, let's focus on step 1 of this workflow: creating
## Setting Up
-1. Clone an example project from GitHub (if you don't have git installed, see the [https://git-scm.com/book/en/v2/Getting-Started-Installing-Git](install instructions) first):
+1. Clone an example project from GitHub (if you don't have git installed, see the [install instructions](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) first):
```shell
git clone -b v1 https://github.com/docker-training/node-bulletin-board
@@ -111,4 +111,4 @@ Further documentation for all CLI commands used in this article are available he
- [docker image *](https://docs.docker.com/engine/reference/commandline/image/)
- [docker container *](https://docs.docker.com/engine/reference/commandline/container/)
- - [Dockerfile reference](https://docs.docker.com/engine/reference/builder/)
\ No newline at end of file
+ - [Dockerfile reference](https://docs.docker.com/engine/reference/builder/)
diff --git a/get-started/part3.md b/get-started/part3.md
index 8ded5a29b4..c9207fc181 100644
--- a/get-started/part3.md
+++ b/get-started/part3.md
@@ -1,5 +1,5 @@
---
-title: "Get Started, Part 3: Deploying to Kubernetes"
+title: "Deploying to Kubernetes"
keywords: kubernetes, pods, deployments, kubernetes services
description: Learn how to describe and deploy a simple application on Kubernetes.
---
@@ -24,7 +24,7 @@ In order to validate that our containerized application works well on Kubernetes
All containers in Kubernetes are scheduled as _pods_, which are groups of co-located containers that share some resources. Furthermore, in a realistic application we almost never create individual pods; instead, most of our workloads are scheduled as _deployments_, which are scalable groups of pods maintained automatically by Kubernetes. Lastly, all Kubernetes objects can and should be described in manifests called _Kubernetes YAML_ files; these YAML files describe all the components and configurations of your Kubernetes app, and can be used to easily create and destroy your app in any Kubernetes environment.
-1. You already wrote a very basic Kubernetes YAML file in the first part of this tutorial; let's write a slightly more sophisticated one now, to run and manage our bulletin board. Place the following in a file called `bb.yaml`and save it in the same place you put the other yaml file.
+1. You already wrote a very basic Kubernetes YAML file in the first part of this tutorial; let's write a slightly more sophisticated one now, to run and manage our bulletin board. Place the following in a file called `bb.yaml`:
```yaml
apiVersion: apps/v1
@@ -125,8 +125,6 @@ At this point, we have successfully used Docker Desktop to deploy our applicatio
In addition to deploying to Kubernetes, we have also described our application as a Kubernetes YAML file. This simple text file contains everything we need to create our application in a running state; we can check it into version control and share it with our colleagues, allowing us to distribute our applications to other clusters (like the testing and production clusters that probably come after our development environments) easily.
-[On to Part 4 >>](part4.md){: class="button outline-btn" style="margin-bottom: 30px; margin-right: 100%"}
-
## Kubernetes References
Further documentation for all new Kubernetes objects used in this article are available here:
diff --git a/get-started/part4.md b/get-started/part4.md
index 1bfb85ccdf..2884626b17 100644
--- a/get-started/part4.md
+++ b/get-started/part4.md
@@ -1,5 +1,5 @@
---
-title: "Get Started, Part 4: Deploying to Swarm"
+title: "Deploying to Swarm"
keywords: swarm, swarm services, stacks
description: Learn how to describe and deploy a simple application on Docker Swarm.
---
diff --git a/get-started/part5.md b/get-started/part5.md
index fb2b464d7f..0baab72488 100644
--- a/get-started/part5.md
+++ b/get-started/part5.md
@@ -1,5 +1,5 @@
---
-title: "Get Started, Part 5: Sharing Images on Docker Hub"
+title: "Sharing images on Docker Hub"
keywords: docker hub, push, images
description: Learn how to share images on Docker Hub.
---
@@ -57,5 +57,3 @@ At this point, you've set up your Docker Hub account and have connected it to yo
Now that your image is available on Docker Hub, you'll be able to run it anywhere; if you try to use it on a new cluster that doesn't have it yet, Docker will automatically try and download it from Docker Hub. By moving images around in this way, we no longer need to install any dependencies except Docker and our orchestrator on the machines we want to run our software on; the dependencies of our containerized applications are completely encapsulated and isolated within our images, which we can share via Docker Hub in the manner above.
Another thing to keep in mind: at the moment, we've only pushed your image to Docker Hub; what about your Dockerfiles, Kube YAML and stack files? A crucial best practice is to keep these in version control, perhaps alongside your source code for your application, and add a link or note in your Docker Hub repository description indicating where these files can be found, preserving the record not only of how your image was built, but how it's meant to be run as a full application.
-
-
diff --git a/install/linux/docker-ee/centos.md b/install/linux/docker-ee/centos.md
index 9cc2670cd2..0340611d19 100644
--- a/install/linux/docker-ee/centos.md
+++ b/install/linux/docker-ee/centos.md
@@ -1,10 +1,10 @@
---
-description: Instructions for installing Docker EE on CentOS
+description: Instructions for installing Docker Engine - Enterprise on CentOS
keywords: requirements, apt, installation, centos, rpm, install, uninstall, upgrade, update
redirect_from:
- /engine/installation/centos/
- /engine/installation/linux/docker-ee/centos/
-title: Get Docker EE for CentOS
+title: Get Docker Engine - Enterprise for CentOS
---
{% assign linux-dist = "centos" %}
@@ -19,32 +19,50 @@ title: Get Docker EE for CentOS
## Prerequisites
-This section lists what you need to consider before installing Docker EE. Items
-that require action are explained below.
+This section lists what you need to consider before installing Docker Engine -
+Enterprise. Items that require action are explained below.
- Use {{ linux-dist-cap }} 64-bit 7.1 and higher on `x86_64`.
-- Use storage driver `overlay2` or `devicemapper` (`direct-lvm` mode in production).
-- Find the URL for your Docker EE repo at [Docker Hub](https://hub.docker.com/my-content){: target="_blank" class="_" }.
+- Use storage driver `overlay2` or `devicemapper` (`direct-lvm` mode in
+ production).
+- Find the URL for your Docker Engine - Enterprise repo at [Docker Hub](https://hub.docker.com/my-content){: target="_blank" class="_" }.
- Uninstall old versions of Docker.
- Remove old Docker repos from `/etc/yum.repos.d/`.
### Architectures and storage drivers
-Docker EE supports {{ linux-dist-long }} 64-bit, latest version, running on `x86_64`.
+Docker Engine - Enterprise supports {{ linux-dist-long }} 64-bit, latest
+version, running on `x86_64`.
-On {{ linux-dist-long }}, Docker EE supports storage drivers, `overlay2` and `devicemapper`. In Docker EE 17.06.2-ee-5 and higher, `overlay2` is the recommended storage driver. The following limitations apply:
+On {{ linux-dist-long }}, Docker Engine - Enterprise supports storage drivers,
+`overlay2` and `devicemapper`. In Docker Engine - Enterprise 17.06.2-ee-5 and
+higher, `overlay2` is the recommended storage driver. The following limitations
+apply:
-- [OverlayFS](/storage/storagedriver/overlayfs-driver){: target="_blank" class="_" }: If `selinux` is enabled, the `overlay2` storage driver is supported on {{ linux-dist-cap }} 7.4 or higher. If `selinux` is disabled, `overlay2` is supported on {{ linux-dist-cap }} 7.2 or higher with kernel version 3.10.0-693 and higher.
+- [OverlayFS](/storage/storagedriver/overlayfs-driver){: target="_blank" class="_" }:
+ If `selinux` is enabled, the `overlay2` storage driver is supported on
+ {{ linux-dist-cap }} 7.4 or higher. If `selinux` is disabled, `overlay2` is
+ supported on {{ linux-dist-cap }} 7.2 or higher with kernel version 3.10.0-693
+ and higher.
-- [Device Mapper](/storage/storagedriver/device-mapper-driver/){: target="_blank" class="_" }: On production systems using `devicemapper`, you must use `direct-lvm` mode, which requires one or more dedicated block devices. Fast storage such as solid-state media (SSD) is recommended. Do not start Docker until properly configured per the [storage guide](/storage/storagedriver/device-mapper-driver/){: target="_blank" class="_" }.
+- [Device Mapper](/storage/storagedriver/device-mapper-driver/){: target="_blank" class="_" }:
+ On production systems using `devicemapper`, you must use `direct-lvm` mode,
+ which requires one or more dedicated block devices. Fast storage such as
+ solid-state media (SSD) is recommended. Do not start Docker until properly
+ configured per the [storage guide](/storage/storagedriver/device-mapper-driver/){: target="_blank" class="_" }.
-### Find your Docker EE repo URL
+### Find your Docker Engine - Enterprise repo URL
{% include ee-linux-install-reuse.md section="find-ee-repo-url" %}
### Uninstall old Docker versions
-The Docker EE package is called `docker-ee`. Older versions were called `docker` or `docker-engine`. Uninstall all older versions and associated dependencies. The contents of `/var/lib/docker/` are preserved, including images, containers, volumes, and networks. If you are upgrading from Docker Engine - Community to Docker EE, remove the Docker Engine - Community package as well.
+The Docker Engine - Enterprise package is called `docker-ee`. Older versions
+were called `docker` or `docker-engine`. Uninstall all older versions and
+associated dependencies. The contents of `/var/lib/docker/` are preserved,
+including images, containers, volumes, and networks. If you are upgrading from
+Docker Engine - Community to Docker Engine - Enterprise, remove the Docker
+Engine - Community package as well.
```bash
$ sudo yum remove docker \
@@ -90,7 +108,7 @@ $ sudo yum remove docker \
{% include ee-linux-install-reuse.md section="upgrade-using-yum-package" %}
-## Uninstall Docker EE
+## Uninstall Docker Engine - Enterprise
{% include ee-linux-install-reuse.md section="yum-uninstall" %}
diff --git a/install/linux/docker-ee/oracle.md b/install/linux/docker-ee/oracle.md
index b4866b5593..23830b3242 100644
--- a/install/linux/docker-ee/oracle.md
+++ b/install/linux/docker-ee/oracle.md
@@ -1,11 +1,11 @@
---
-description: Instructions for installing Docker EE on Oracle Linux
+description: Instructions for installing Docker Engine - Enterprise on Oracle Linux
keywords: requirements, installation, oracle, ol, rpm, install, uninstall, upgrade, update
redirect_from:
- /engine/installation/oracle/
- /engine/installation/linux/oracle/
- /engine/installation/linux/docker-ee/oracle/
-title: Get Docker EE for Oracle Linux
+title: Get Docker Engine - Enterprise for Oracle Linux
---
{% assign linux-dist = "oraclelinux" %}
@@ -20,28 +20,39 @@ title: Get Docker EE for Oracle Linux
## Prerequisites
-This section lists what you need to consider before installing Docker EE. Items that require action are explained below.
+This section lists what you need to consider before installing Docker Engine -
+Enterprise. Items that require action are explained below.
- Use {{ linux-dist-cap }} 64-bit 7.3 or higher on RHCK 3.10.0-514 or higher.
- Use the `devicemapper` storage driver only (`direct-lvm` mode in production).
-- Find the URL for your Docker EE repo at [Docker Hub](https://hub.docker.com/my-content){: target="_blank" class="_" }.
+- Find the URL for your Docker Engine - Enterprise repo at [Docker Hub](https://hub.docker.com/my-content){: target="_blank" class="_" }.
- Uninstall old versions of Docker.
- Remove old Docker repos from `/etc/yum.repos.d/`.
-- Disable SELinux if installing or upgrading Docker EE 17.06.1 or newer.
+- Disable SELinux if installing or upgrading Docker Engine - Enterprise 17.06.1
+ or newer.
### Architectures and storage drivers
-Docker EE supports {{ linux-dist-long }} 64-bit, versions 7.3 and higher, running the Red Hat Compatible kernel (RHCK) 3.10.0-514 or higher. Older versions of {{ linux-dist-long }} are not supported.
+Docker Engine - Enterprise supports {{ linux-dist-long }} 64-bit, versions 7.3
+and higher, running the Red Hat Compatible kernel (RHCK) 3.10.0-514 or higher.
+Older versions of {{ linux-dist-long }} are not supported.
-On {{ linux-dist-long }}, Docker EE only supports the `devicemapper` storage driver. In production, you must use it in `direct-lvm` mode, which requires one or more dedicated block devices. Fast storage such as solid-state media (SSD) is recommended. Do not start Docker until properly configured per the [storage guide](/storage/storagedriver/device-mapper-driver/){: target="_blank" class="_" }.
+On {{ linux-dist-long }}, Docker Engine - Enterprise only supports the
+`devicemapper` storage driver. In production, you must use it in `direct-lvm`
+mode, which requires one or more dedicated block devices. Fast storage such as
+solid-state media (SSD) is recommended. Do not start Docker until properly
+configured per the [storage guide](/storage/storagedriver/device-mapper-driver/){: target="_blank" class="_" }.
-### Find your Docker EE repo URL
+### Find your Docker Engine - Enterprise repo URL
{% include ee-linux-install-reuse.md section="find-ee-repo-url" %}
### Uninstall old Docker versions
-The Docker EE package is called `docker-ee`. Older versions were called `docker` or `docker-engine`. Uninstall all older versions and associated dependencies. The contents of `/var/lib/docker/` are preserved, including images, containers, volumes, and networks.
+The Docker Engine - Enterprise package is called `docker-ee`. Older versions
+were called `docker` or `docker-engine`. Uninstall all older versions and
+associated dependencies. The contents of `/var/lib/docker/` are preserved,
+including images, containers, volumes, and networks.
```bash
$ sudo yum remove docker \
@@ -82,7 +93,7 @@ $ sudo yum remove docker \
{% include ee-linux-install-reuse.md section="upgrade-using-yum-package" %}
-## Uninstall Docker EE
+## Uninstall Docker Engine - Enterprise
{% include ee-linux-install-reuse.md section="yum-uninstall" %}
diff --git a/install/linux/docker-ee/rhel.md b/install/linux/docker-ee/rhel.md
index 078ac50657..8f0fd0b80b 100644
--- a/install/linux/docker-ee/rhel.md
+++ b/install/linux/docker-ee/rhel.md
@@ -1,12 +1,12 @@
---
-description: Instructions for installing Docker EE on RHEL
+description: Instructions for installing Docker Engine - Enterprise on RHEL
keywords: requirements, installation, rhel, rpm, install, uninstall, upgrade, update
redirect_from:
- /engine/installation/rhel/
- /installation/rhel/
- /engine/installation/linux/rhel/
- /engine/installation/linux/docker-ee/rhel/
-title: Get Docker EE for Red Hat Enterprise Linux
+title: Get Docker Engine - Enterprise for Red Hat Enterprise Linux
---
{% assign linux-dist = "rhel" %}
@@ -21,28 +21,44 @@ title: Get Docker EE for Red Hat Enterprise Linux
## Prerequisites
-This section lists what you need to consider before installing Docker EE. Items that require action are explained below.
+This section lists what you need to consider before installing Docker Engine -
+Enterprise. Items that require action are explained below.
-- Use {{ linux-dist-cap }} 64-bit 7.4 and higher on `x86_64`, or `s390x`.
-- Use storage driver `overlay2` or `devicemapper` (`direct-lvm` mode in production).
-- Find the URL for your Docker EE repo at [Docker Hub](https://hub.docker.com/my-content){: target="_blank" class="_" }.
+- Use {{ linux-dist-cap }} 64-bit 7.4 and higher on `x86_64`.
+- Use storage driver `overlay2` or `devicemapper` (`direct-lvm` mode in
+ production).
+- Find the URL for your Docker Engine - Enterprise repo at [Docker Hub](https://hub.docker.com/my-content){: target="_blank" class="_" }.
- Uninstall old versions of Docker.
- Remove old Docker repos from `/etc/yum.repos.d/`.
-- Disable SELinux on `s390x` (IBM Z) systems before install/upgrade.
+
+> **Note:**
+> IBM Z (`s390x`) is supported for Docker Engine - Enterprise 17.06.xx only. If
+> you're going to install Docker on an IBM Z system, disable SELinux before
+> installing/upgrading and make sure you're installing Docker Engine -
+> Enterprise 17.06.xx.
### Architectures and storage drivers
-Docker EE supports {{ linux-dist-long }} 64-bit, versions 7.4 and higher running on one of the following architectures: `x86_64`, or `s390x` (IBM Z). See [Compatability Matrix](https://success.docker.com/article/compatibility-matrix){: target="_blank" class="_" }) for specific details.
+Docker Engine - Enterprise supports {{ linux-dist-long }} 64-bit, versions 7.4
+and higher running on `x86_64`. See [Compatibility Matrix](https://success.docker.com/article/compatibility-matrix){: target="_blank" class="_" }
+for specific details.
-> Little-endian format only
->
-> On IBM Power systems, Docker EE only supports little-endian format, `ppc64le`, even though {{ linux-dist-cap }} 7 ships both big and little-endian versions.
+On {{ linux-dist-long }}, Docker Engine - Enterprise supports storage drivers,
+`overlay2` and `devicemapper`. In Docker Engine - Enterprise 17.06.2-ee-5 and
+higher, `overlay2` is the recommended storage driver. The following limitations
+apply:
-On {{ linux-dist-long }}, Docker EE supports storage drivers, `overlay2` and `devicemapper`. In Docker EE 17.06.2-ee-5 and higher, `overlay2` is the recommended storage driver. The following limitations apply:
+- [OverlayFS](/storage/storagedriver/overlayfs-driver){: target="_blank" class="_" }:
+ If `selinux` is enabled, the `overlay2` storage driver is supported on
+ {{ linux-dist-cap }} 7.4 or higher. If `selinux` is disabled, `overlay2` is
+ supported on {{ linux-dist-cap }} 7.2 or higher with kernel version 3.10.0-693
+ and higher.
-- [OverlayFS](/storage/storagedriver/overlayfs-driver){: target="_blank" class="_" }: If `selinux` is enabled, the `overlay2` storage driver is supported on {{ linux-dist-cap }} 7.4 or higher. If `selinux` is disabled, `overlay2` is supported on {{ linux-dist-cap }} 7.2 or higher with kernel version 3.10.0-693 and higher.
-
-- [Device Mapper](/storage/storagedriver/device-mapper-driver/){: target="_blank" class="_" }: On production systems using `devicemapper`, you must use `direct-lvm` mode, which requires one or more dedicated block devices. Fast storage such as solid-state media (SSD) is recommended. Do not start Docker until properly configured per the [storage guide](/storage/storagedriver/device-mapper-driver/){: target="_blank" class="_" }.
+- [Device Mapper](/storage/storagedriver/device-mapper-driver/){: target="_blank" class="_" }:
+ On production systems using `devicemapper`, you must use `direct-lvm` mode,
+ which requires one or more dedicated block devices. Fast storage such as
+ solid-state media (SSD) is recommended. Do not start Docker until properly
+ configured per the [storage guide](/storage/storagedriver/device-mapper-driver/){: target="_blank" class="_" }.
### FIPS 140-2 cryptographic module support
@@ -65,7 +81,8 @@ $ cat /proc/sys/crypto/fips_enabled
1
```
-> **Note**: FIPS is only supported in the Docker Engine Engine - Enterprise. UCP
+> **Note:**
+> FIPS is only supported in Docker Engine Engine - Enterprise. UCP
> and DTR currently do not have support for FIPS-140-2.
You can override FIPS 140-2 compliance on a system that is not in FIPS 140-2
@@ -89,7 +106,7 @@ Restart the Docker service as root.
`$ sudo systemctl restart docker`
To confirm Docker is running with FIPS-140-2 enabled, run the `docker info`
-command:
+command.
{% raw %}
```
@@ -114,13 +131,16 @@ Restart the Docker service as root.
`$ sudo systemctl restart docker`
-### Find your Docker EE repo URL
+### Find your Docker Engine - Enterprise repo URL
{% include ee-linux-install-reuse.md section="find-ee-repo-url" %}
### Uninstall old Docker versions
-The Docker EE package is called `docker-ee`. Older versions were called `docker` or `docker-engine`. Uninstall all older versions and associated dependencies. The contents of `/var/lib/docker/` are preserved, including images, containers, volumes, and networks.
+The Docker Engine - Enterprise package is called `docker-ee`. Older versions
+were called `docker` or `docker-engine`. Uninstall all older versions and
+associated dependencies. The contents of `/var/lib/docker/` are preserved,
+including images, containers, volumes, and networks.
```bash
$ sudo yum remove docker \
@@ -142,9 +162,15 @@ $ sudo yum remove docker \
{% include ee-linux-install-reuse.md section="using-yum-repo" %}
{% capture selinux-warning %}
-> Disable SELinux before installing Docker EE on IBM Z systems
+> Disable SELinux before installing Docker Engine - Enterprise 17.06.xx on IBM Z
+> systems
>
-> There is currently no support for `selinux` on IBM Z systems. If you attempt to install or upgrade Docker EE on an IBM Z system with `selinux` enabled, an error is thrown that the `container-selinux` package is not found. Disable `selinux` before installing or upgrading Docker on IBM Z.
+> There is currently no support for `selinux` on IBM Z systems. If you attempt
+> to install or upgrade Docker Engine - Enterprise on an IBM Z system with
+> `selinux` enabled, an error is thrown that the `container-selinux` package is
+> not found. Disable `selinux` before installing or upgrading Docker on IBM Z.
+> IBM Z systems are supported on Docker Engine - Enterprise versions 17.06.xx
+> only.
{:.warning}
{% endcapture %}
{{ selinux-warning }}
@@ -178,7 +204,7 @@ $ sudo yum remove docker \
{% include ee-linux-install-reuse.md section="upgrade-using-yum-package" %}
-## Uninstall Docker EE
+## Uninstall Docker Engine - Enterprise
{% include ee-linux-install-reuse.md section="yum-uninstall" %}
diff --git a/install/linux/docker-ee/suse.md b/install/linux/docker-ee/suse.md
index 1f68ca9fc1..a9d419b317 100644
--- a/install/linux/docker-ee/suse.md
+++ b/install/linux/docker-ee/suse.md
@@ -1,12 +1,12 @@
---
-description: Instructions for installing Docker EE on SLES
+description: Instructions for installing Docker Engine - Enterprise on SLES
keywords: requirements, apt, installation, suse, opensuse, sles, rpm, install, uninstall, upgrade, update
redirect_from:
- /engine/installation/SUSE/
- /engine/installation/linux/SUSE/
- /engine/installation/linux/suse/
- /engine/installation/linux/docker-ee/suse/
-title: Get Docker EE for SLES
+title: Get Docker Engine - Enterprise for SLES
toc_max: 4
---
@@ -16,12 +16,13 @@ To get started with Docker on SUSE Linux Enterprise Server (SLES), make sure you
## Prerequisites
-### Docker EE URL
+### Docker Engine - Enterprise URL
-To install Docker Enterprise Edition (Docker EE), you need to know the Docker EE
-repository URL associated with your trial or subscription. These instructions
-work for Docker EE for SLES and for Docker EE for Linux, which includes access
-to Docker EE for all Linux distributions. To get this information:
+To install Docker Engine - Enterprise, you need to know the Docker Engine -
+Enterprise repository URL associated with your trial or subscription. These
+instructions work for Docker on SLES and for Docker on Linux, which includes
+access to Docker Engine - Enterprise for all Linux distributions. To get this
+information, do the following:
- Go to [https://hub.docker.com/my-content](https://hub.docker.com/my-content).
- Each subscription or trial you have access to is listed. Click the **Setup**
@@ -31,20 +32,23 @@ to Docker EE for all Linux distributions. To get this information:
Use this URL when you see the placeholder text ``.
-To learn more about Docker EE, see
+To learn more about Docker Enterprise, see
[Docker Enterprise Edition](https://www.docker.com/enterprise-edition/){: target="_blank" class="_" }.
-Docker Community Edition (Docker CE) is not supported on SLES.
+Docker Engine - Community is not supported on SLES.
### OS requirements
-To install Docker EE, you need the 64-bit version of SLES 12.x, running on
-`x86_64`, `s390x` (IBM Z), or `ppc64le` (IBM Power) architectures. Docker EE is
-not supported on OpenSUSE.
+To install Docker Engine - Enterprise, you need the 64-bit version of SLES 12.x,
+running on the `x86_64` architecture. Docker Engine - Enterprise is not
+supported on OpenSUSE.
-The only supported storage driver for Docker EE on SLES is Btrfs, which is
-used by default if the underlying filesystem hosting `/var/lib/docker/` is a
-BTRFS filesystem.
+The only supported storage driver for Docker Engine - Enterprise on SLES is
+`Btrfs`, which is used by default if the underlying filesystem hosting
+`/var/lib/docker/` is a BTRFS filesystem.
+
+> **Note:**
+> IBM Z (`s390x`) is supported for Docker Engine - Enterprise 17.06.xx only.
#### Firewall configuration
@@ -70,7 +74,7 @@ See the
Older versions of Docker were called `docker` or `docker-engine`. If you use OS
images from a cloud provider, you may need to remove the `runc` package, which
-conflicts with Docker EE. If these are installed, uninstall them, along with
+conflicts with Docker. If these are installed, uninstall them, along with
associated dependencies.
```bash
@@ -87,7 +91,8 @@ $ sudo rpm -e docker-engine
It's OK if `zypper` reports that none of these packages are installed.
The contents of `/var/lib/docker/`, including images, containers, volumes, and
-networks, are preserved. The Docker EE package is now called `docker-ee`.
+networks, are preserved. The Docker Engine - Enterprise package is now called
+`docker-ee`.
## Configure the Btrfs filesystem
@@ -106,8 +111,8 @@ BTRFS filesystem and mount it on `/var/lib/docker/`.
$ df -T / /var /var/lib /var/lib/docker
```
- You need to complete the rest of these steps **only if one of the following
- is true**:
+ You need to complete the rest of these steps **only if one of the**
+ **following is true**:
- You have a separate `/var/` filesystem that is not formatted with Btrfs
- You do not have a separate `/var/` or `/var/lib/` or `/var/lib/docker/`
@@ -146,9 +151,10 @@ BTRFS filesystem and mount it on `/var/lib/docker/`.
during step 1, restore them onto `/var/lib/docker`.
-## Install Docker EE
+## Install Docker Engine - Enterprise
-You can install Docker EE in different ways, depending on your needs:
+You can install Docker Engine - Enterprise in different ways, depending on your
+needs.
- Most users
[set up Docker's repositories](#install-using-the-repository) and install
@@ -161,39 +167,41 @@ You can install Docker EE in different ways, depending on your needs:
### Install using the repository
-Before you install Docker EE for the first time on a new host machine, you need
-to set up the Docker repository. Afterward, you can install and update Docker EE
-from the repository.
+Before you install Docker Engine - Enterprise for the first time on a new host
+machine, you need to set up the Docker repository. Afterward, you can install
+and update Docker from the repository.
-> **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).
+> **Note:** If you need to run Docker Enterprise 2.0, please see the
+> following instructions:
+> * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Older
+> Docker Engine - Enterprise only release
+> * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Docker
+> Enterprise Edition 2.0 (Docker Engine, UCP, and DTR).
#### Set up the repository
-1. Temporarily add the `$DOCKER_EE_BASE_URL` and `$DOCKER_EE_URL` variables into your environment. This
- only persists until you log out of the session. Replace ``
- listed below with the URL you noted down in the [prerequisites](#prerequisites).
+1. Temporarily add the `$DOCKER_EE_BASE_URL` and `$DOCKER_EE_URL` variables
+ into your environment. This only persists until you log out of the session.
+ Replace `` listed below with the URL you noted down in the
+ [prerequisites](#prerequisites).
```bash
$ DOCKER_EE_BASE_URL=""
$ DOCKER_EE_URL="${DOCKER_EE_BASE_URL}/sles///stable-"
```
- Where:
+ And substitute the following:
* `DOCKER-EE-URL` is the URL from your Docker Hub subscription.
* `SLES_VERSION` is `15` or `12.3`.
- * `ARCH` is `x86_64`, `s390x`, or `ppc64le`.
- * `DOCKER_VERSION` is `19.03` or one of the older releases (`18.09`, `18.03`, `17.06` etc.)
+ * `ARCH` is `x86_64`.
+ * `DOCKER_VERSION` is `19.03` or one of the older releases (`18.09`,
+ `18.03`, `17.06` etc.)
- As an example your command should look like:
+ As an example, your command should look like:
```bash
-
DOCKER_EE_BASE_URL="https://storebits.docker.com/ee/sles/sub-555-55-555"
- DOCKER_EE_URL="${DOCKER_EE_BASE_URL}/sles/15/x86_64/stable-19.03
-
+ DOCKER_EE_URL="${DOCKER_EE_BASE_URL}/sles/15/x86_64/stable-19.03"
```
2. Use the following command to set up the **stable** repository. Use the
@@ -211,7 +219,7 @@ from the repository.
$ sudo rpm --import "${DOCKER_EE_BASE_URL}/sles/gpg"
```
-#### Install Docker EE
+#### Install Docker Engine - Enterprise
1. Update the `zypper` package index.
@@ -225,23 +233,23 @@ from the repository.
`77FE DA13 1A83 1D29 A418 D3E8 99E5 FF2E 7668 2BC9` and if so, accept the
key.
-2. Install the latest version of Docker EE and containerd, or go to the next step to install a
- specific version.
+2. Install the latest version of Docker Engine - Enterprise and containerd, or
+ go to the next step to install a specific version.
```bash
$ sudo zypper install docker-ee docker-ee-cli containerd.io
```
- Start Docker:
+ Start Docker.
```bash
$ sudo service docker start
```
-3. On production systems, you should install a specific version of Docker EE
- instead of always using the latest. List the available versions. The
- following example only lists binary packages and is truncated. To also list
- source packages, omit the `-t package` flag from the command.
+3. On production systems, you should install a specific version of Docker
+ Engine - Enterprise instead of always using the latest. List the available
+ versions. The following example only lists binary packages and is truncated.
+ To also list source packages, omit the `-t package` flag from the command.
```bash
$ zypper search -s --match-exact -t package docker-ee
@@ -249,7 +257,7 @@ from the repository.
Loading repository data...
Reading installed packages...
- S | Name | Type | Version | Arch | Repository
+ S | Name | Type | Version | Arch | Repository
--+---------------+---------+---------------------------------------+--------+---------------
| docker-ee | package | {{ site.docker_ee_version }}-1 | x86_64 | docker-ee-stable
```
@@ -268,9 +276,9 @@ from the repository.
Docker is installed but not started. The `docker` group is created, but no
users are added to the group.
-4. Configure Docker EE to use the Btrfs filesystem. **This is only required if
- the `/` filesystem is not using BTRFS.** However, explicitly specifying the
- `storage-driver` has no harmful side effects.
+4. Configure Docker to use the Btrfs filesystem. **This is only required if**
+ **the `/` filesystem is not using BTRFS.** However, explicitly specifying
+ the `storage-driver` has no harmful side effects.
Edit the file `/etc/docker/daemon.json` (create it if it does not exist) and
add the following contents:
@@ -283,13 +291,13 @@ from the repository.
Save and close the file.
-5. Start Docker:
+5. Start Docker.
```bash
$ sudo service docker start
```
-6. Verify that Docker EE is installed correctly by running the `hello-world`
+6. Verify that Docker is installed correctly by running the `hello-world`
image.
```bash
@@ -299,58 +307,58 @@ from the repository.
This command downloads a test image and runs it in a container. When the
container runs, it prints an informational message and exits.
-Docker EE is installed and running. You need to use `sudo` to run Docker
-commands. Continue to [Linux postinstall](/install/linux/linux-postinstall.md) to configure the
-graph storage driver, allow non-privileged users to run Docker commands, and for
-other optional configuration steps.
+Docker Engine - Enterprise is installed and running. You need to use `sudo` to
+run Docker commands. Continue to [Linux postinstall](/install/linux/linux-postinstall.md)
+to configure the graph storage driver, allow non-privileged users to run Docker
+commands, and for other optional configuration steps.
-> **Important**: Be sure Docker is configured to start after the system
+> **Important:** Be sure Docker is configured to start after the system
> firewall. See [Firewall configuration](#firewall-configuration).
-#### Upgrade Docker EE
+#### Upgrade Docker Engine - Enterprise
-To upgrade Docker EE:
+To upgrade Docker Engine - Enterprise, follow the steps below:
-1. If upgrading to a new major Docker EE version (such as when going from
- Docker 18.03.x to Docker 18.09.x),
+1. If upgrading to a new major Docker Engine - Enterprise version (such as when
+ going from Docker 18.03.x to Docker 18.09.x),
[add the new repository](#set-up-the-repository){: target="_blank" class="_" }.
2. Run `sudo zypper refresh`.
3. Follow the
- [installation instructions](#install-docker-ee), choosing the new version you want
- to install.
+ [installation instructions](#install-docker-ee), choosing the new version
+ you want to install.
### Install from a package
-If you cannot use the official Docker repository to install Docker EE, you can
-download the `.rpm` file for your release and install it manually. You
-need to download a new file each time you want to upgrade Docker EE.
+If you cannot use the official Docker repository to install Docker Engine -
+Enterprise, you can download the `.rpm` file for your release and install it
+manually. You need to download a new file each time you want to upgrade Docker.
-1. Go to the Docker EE repository URL associated with your
+1. Go to the Docker Engine - Enterprise repository URL associated with your
trial or subscription in your browser. Go to `sles/12.3/` choose the
- directory corresponding to your architecture and desired Docker EE version.
- Download the `.rpm` file from the `Packages` directory.
+ directory corresponding to your architecture and desired Docker Engine -
+ Enterprise version. Download the `.rpm` file from the `Packages` directory.
-2. Import Docker's official GPG key:
+2. Import Docker's official GPG key.
```bash
$ sudo rpm --import /sles/gpg
```
-3. Install Docker EE, changing the path below to the path where you downloaded
- the Docker package.
+3. Install Docker, changing the path below to the path where you downloaded the
+ Docker package.
```bash
$ sudo zypper install /path/to/package.rpm
```
- Docker EE is installed but not started. The `docker` group is created, but no
+ Docker is installed but not started. The `docker` group is created, but no
users are added to the group.
-4. Configure Docker EE to use the Btrfs filesystem. **This is only required if
- the `/` filesystem is not using Btrfs.** However, explicitly specifying the
- `storage-driver` has no harmful side effects.
+4. Configure Docker to use the Btrfs filesystem. **This is only required if**
+ **the `/` filesystem is not using Btrfs.** However, explicitly specifying
+ the `storage-driver` has no harmful side effects.
Edit the file `/etc/docker/daemon.json` (create it if it does not exist) and
add the following contents:
@@ -363,13 +371,13 @@ need to download a new file each time you want to upgrade Docker EE.
Save and close the file.
-5. Start Docker:
+5. Start Docker.
```bash
$ sudo service docker start
```
-6. Verify that Docker EE is installed correctly by running the `hello-world`
+6. Verify that Docker is installed correctly by running the `hello-world`
image.
```bash
@@ -379,23 +387,23 @@ need to download a new file each time you want to upgrade Docker EE.
This command downloads a test image and runs it in a container. When the
container runs, it prints an informational message and exits.
-Docker EE is installed and running. You need to use `sudo` to run Docker
-commands. Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md)
+Docker Engine - Enterprise is installed and running. You need to use `sudo` to
+run Docker commands. Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md)
to allow non-privileged users to run Docker commands and for other optional
configuration steps.
-> **Important**: Be sure Docker is configured to start after the system
+> **Important:** Be sure Docker is configured to start after the system
> firewall. See [Firewall configuration](#firewall-configuration).
-#### Upgrade Docker EE
+#### Upgrade Docker Engine - Enterprise
-To upgrade Docker EE, download the newer package file and repeat the
-[installation procedure](#install-from-a-package), using `zypper update`
-instead of `zypper install`, and pointing to the new file.
+To upgrade Docker Engine - Enterprise, download the newer package file and
+repeat the [installation procedure](#install-from-a-package), using
+`zypper update` instead of `zypper install`, and pointing to the new file.
-## Uninstall Docker EE
+## Uninstall Docker Engine - Enterprise
-1. Uninstall the Docker EE package using the following command.
+1. Uninstall the Docker Engine - Enterprise package using the command below.
```bash
$ sudo zypper rm docker-ee
@@ -403,7 +411,7 @@ instead of `zypper install`, and pointing to the new file.
2. Images, containers, volumes, or customized configuration files on your host
are not automatically removed. To delete all images, containers, and
- volumes:
+ volumes.
```bash
$ sudo rm -rf /var/lib/docker/*
diff --git a/install/linux/docker-ee/ubuntu.md b/install/linux/docker-ee/ubuntu.md
index ccbce47f43..3a76382bb0 100644
--- a/install/linux/docker-ee/ubuntu.md
+++ b/install/linux/docker-ee/ubuntu.md
@@ -1,16 +1,16 @@
---
-description: Instructions for installing Docker EE on Ubuntu
+description: Instructions for installing Docker Engine - Enterprise on Ubuntu
keywords: requirements, apt, installation, ubuntu, install, uninstall, upgrade, update
redirect_from:
- /engine/installation/ubuntulinux/
- /installation/ubuntulinux/
- /engine/installation/linux/ubuntulinux/
- /engine/installation/linux/docker-ee/ubuntu/
-title: Get Docker EE for Ubuntu
+title: Get Docker Engine - Enterprise for Ubuntu
toc_max: 4
---
-To get started with Docker EE on Ubuntu, make sure you
+To get started with Docker Engine - Enterprise on Ubuntu, make sure you
[meet the prerequisites](#prerequisites), then
[install Docker](#install-docker-ee).
@@ -20,10 +20,11 @@ Docker Engine - Community users should go to
[Get Docker Engine - Community for Ubuntu](/install/linux/docker-ce/ubuntu.md)
**instead of this topic**.
-To install Docker Enterprise Edition (Docker EE), you need to know the Docker EE
-repository URL associated with your trial or subscription. These instructions
-work for Docker EE for Ubuntu and for Docker EE for Linux, which includes access
-to Docker EE for all Linux distributions. To get this information:
+To install Docker Engine - Enterprise, you need to know the Docker Engine -
+Enterprise repository URL associated with your trial or subscription. These
+instructions work for Docker on Ubuntu and for Docker on Linux, which includes
+access to Docker Engine - Enterprise for all Linux distributions. To get this
+information, do the following:
- Go to [https://hub.docker.com/my-content](https://hub.docker.com/my-content).
- Each subscription or trial you have access to is listed. Click the **Setup**
@@ -33,18 +34,22 @@ to Docker EE for all Linux distributions. To get this information:
Use this URL when you see the placeholder text ``.
-To learn more about Docker EE, see
+To learn more about Docker Enterprise, see
[Docker Enterprise Edition](https://www.docker.com/enterprise-edition/){: target="_blank" class="_" }.
-### System requirements
+### OS requirements
To learn more about software requirements and supported storage drivers,
check the [compatibility matrix](https://success.docker.com/article/compatibility-matrix).
+> **Note:**
+> IBM Z (`s390x`) is supported for Docker Engine - Enterprise 17.06.xx only.
+
### Uninstall old versions
Older versions of Docker were called `docker` or `docker-engine`. In addition,
-if you are upgrading from Docker Engine - Community to Docker EE, remove the Docker Engine - Community package.
+if you are upgrading from Docker Engine - Community to Docker Engine -
+Enterprise, remove the Docker Engine - Community package.
```bash
$ sudo apt-get remove docker docker-engine docker-ce docker-ce-cli docker.io
@@ -53,18 +58,20 @@ $ sudo apt-get remove docker docker-engine docker-ce docker-ce-cli docker.io
It's OK if `apt-get` reports that none of these packages are installed.
The contents of `/var/lib/docker/`, including images, containers, volumes, and
-networks, are preserved. The Docker EE package is now called `docker-ee`.
+networks, are preserved. The Docker Engine - Enterprise package is now called
+`docker-ee`.
#### Extra steps for aufs
For Ubuntu 16.04 and higher, the Linux kernel includes support for overlay2,
-and Docker EE uses it as the default storage driver. If you need
-to use `aufs` instead, you need to configure it manually.
-See [aufs](/engine/userguide/storagedriver/aufs-driver.md)
+and Docker Engine - Enterprise uses it as the default storage driver. If you
+need to use `aufs` instead, you need to configure it manually.
+See [aufs](/engine/userguide/storagedriver/aufs-driver.md).
-## Install Docker EE
+## Install Docker Engine - Enterprise
-You can install Docker EE in different ways, depending on your needs:
+You can install Docker Engine - Enterprise in different ways, depending on your
+needs.
- Most users
[set up Docker's repositories](#install-using-the-repository) and install
@@ -77,19 +84,19 @@ You can install Docker EE in different ways, depending on your needs:
### Install using the repository
-Before you install Docker EE for the first time on a new host machine, you need
-to set up the Docker repository. Afterward, you can install and update Docker EE
-from the repository.
+Before you install Docker Engine - Enterprise for the first time on a new host
+machine, you need to set up the Docker repository. Afterward, you can install
+and update Docker Engine - Enterprise from the repository.
#### Set up the repository
-1. Update the `apt` package index:
+1. Update the `apt` package index.
```bash
$ sudo apt-get update
```
-2. Install packages to allow `apt` to use a repository over HTTPS:
+2. Install packages to allow `apt` to use a repository over HTTPS.
```bash
$ sudo apt-get install \
@@ -109,12 +116,12 @@ from the repository.
4. Temporarily add a `$DOCKER_EE_VERSION` variable into your environment.
- > **Note**: If you need to run something other than Docker EE 3.0, please
- > see the following instructions:
+ > **Note:** If you need to run Docker Enterprise 2.0, please see the
+ > following instructions:
> * [18.09](https://docs.docker.com/v18.09/ee/supported-platforms/) - Docker
> Enterprise Edition 2.1 (Docker Engine, UCP, and DTR).
> * [18.03](https://docs.docker.com/v18.03/ee/supported-platforms/) - Older
- > Docker EE Engine only release
+ > Docker Engine - Enterprise only release
> * [17.06](https://docs.docker.com/v17.06/engine/installation/) - Docker
> Enterprise Edition 2.0 (Docker Engine, UCP, and DTR).
@@ -122,7 +129,8 @@ from the repository.
$ DOCKER_EE_VERSION={{ site.docker_ee_version }}
```
-5. Add Docker's official GPG key using your customer Docker EE repository URL:
+5. Add Docker's official GPG key using your customer Docker Engine - Enterprise
+ repository URL.
```bash
$ curl -fsSL "${DOCKER_EE_URL}/ubuntu/gpg" | sudo apt-key add -
@@ -145,7 +153,7 @@ from the repository.
6. Use the following command to set up the **stable** repository. Use the
command as-is. It works because of the variable you set earlier.
- > **Note**: The `lsb_release -cs` sub-command below returns the name of your
+ > **Note:** The `lsb_release -cs` sub-command below returns the name of your
> Ubuntu distribution, such as `xenial`.
>
@@ -156,7 +164,7 @@ from the repository.
stable-$DOCKER_EE_VERSION"
```
-#### Install Docker EE
+#### Install Docker Engine - Enterprise
1. Update the `apt` package index.
@@ -164,24 +172,26 @@ from the repository.
$ sudo apt-get update
```
-2. Install the latest version of Docker EE, or go to the next step to install a
- specific version. Any existing installation of Docker EE is replaced.
+2. Install the latest version of Docker Engine - Enterprise, or go to the next
+ step to install a specific version. Any existing installation of Docker is
+ replaced.
- Use this command to install the latest version of Docker EE and containerd:
+ Use this command to install the latest version of Docker Engine - Enterprise
+ and containerd:
```bash
$ sudo apt-get install docker-ee docker-ee-cli containerd.io
```
- > **Warning**: If you have multiple Docker repositories enabled, installing
+ > **Warning:** If you have multiple Docker repositories enabled, installing
> or updating without specifying a version in the `apt-get install` or
> `apt-get update` command always installs the highest possible version,
> which may not be appropriate for your stability needs.
{:.warning}
-3. On production systems, you should install a specific version of Docker EE
- instead of always using the latest. This output is truncated. List the
- available versions.
+3. On production systems, you should install a specific version of Docker
+ Engine - Enterprise instead of always using the latest. This output is
+ truncated. List the available versions.
```bash
$ apt-cache madison docker-ee
@@ -195,7 +205,8 @@ from the repository.
install. The second column is the version string. The third column is the
repository name, which indicates which repository the package is from and
by extension its stability level. To install a specific version, append the
- version string to the package name and separate them by an equals sign (`=`):
+ version string to the package name and separate them by an equals sign
+ (`=`).
```bash
$ sudo apt-get install docker-ee= docker-ee-cli= containerd.io
@@ -203,7 +214,7 @@ from the repository.
The Docker daemon starts automatically.
-4. Verify that Docker EE is installed correctly by running the `hello-world`
+4. Verify that Docker is installed correctly by running the `hello-world`
image.
```bash
@@ -213,18 +224,18 @@ from the repository.
This command downloads a test image and runs it in a container. When the
container runs, it prints an informational message and exits.
-Docker EE is installed and running. The `docker` group is created but no users
-are added to it. You need to use `sudo` to run Docker
-commands. Continue to [Linux postinstall](/install/linux/linux-postinstall.md) to allow
-non-privileged users to run Docker commands and for other optional configuration
-steps.
+Docker Engine - Enterprise is installed and running. The `docker` group is
+created but no users are added to it. You need to use `sudo` to run Docker
+commands. Continue to [Linux postinstall](/install/linux/linux-postinstall.md)
+to allow non-privileged users to run Docker commands and for other optional
+configuration steps.
-#### Upgrade Docker EE
+#### Upgrade Docker Engine - Enterprise
-To upgrade Docker EE:
+To upgrade Docker Engine - Enterprise, follow the steps below:
-1. If upgrading to a new major Docker EE version (such as when going from
- Docker 18.03.x to Docker 18.09.x),
+1. If upgrading to a new major Docker Engine - Enterprise version (such as when
+ going from Docker 18.03.x to Docker 18.09.x),
[add the new repository](#set-up-the-repository){: target="_blank" class="_" }.
2. Run `sudo apt-get update`.
@@ -235,17 +246,17 @@ To upgrade Docker EE:
### Install from a package
-If you cannot use Docker's repository to install Docker EE, you can download the
-`.deb` file for your release and install it manually. You need to download
-a new file each time you want to upgrade Docker EE.
+If you cannot use Docker's repository to install Docker Engine - Enterprise, you
+can download the `.deb` file for your release and install it manually. You need
+to download a new file each time you want to upgrade Docker Engine - Enterprise.
-1. Go to the Docker EE repository URL associated with your
+1. Go to the Docker Engine - Enterprise repository URL associated with your
trial or subscription in your browser. Go to
`ubuntu/x86_64/stable-` and download the `.deb` file for the
- Docker EE version and architecture you want to install.
+ Docker Engine - Enterprise version and architecture you want to install.
-2. Install Docker EE, changing the path below to the path where you downloaded
- the Docker EE package.
+2. Install Docker, changing the path below to the path where you downloaded
+ the Docker Engine - Enterprise package.
```bash
$ sudo dpkg -i /path/to/package.deb
@@ -253,7 +264,7 @@ a new file each time you want to upgrade Docker EE.
The Docker daemon starts automatically.
-3. Verify that Docker EE is installed correctly by running the `hello-world`
+3. Verify that Docker is installed correctly by running the `hello-world`
image.
```bash
@@ -263,20 +274,21 @@ a new file each time you want to upgrade Docker EE.
This command downloads a test image and runs it in a container. When the
container runs, it prints an informational message and exits.
-Docker EE is installed and running. The `docker` group is created but no users
-are added to it. You need to use `sudo` to run Docker
+Docker Engine - Enterprise is installed and running. The `docker` group is
+created but no users are added to it. You need to use `sudo` to run Docker
commands. Continue to [Post-installation steps for Linux](/install/linux/linux-postinstall.md)
to allow non-privileged users to run Docker commands and for other optional
configuration steps.
-#### Upgrade Docker EE
+#### Upgrade Docker Engine - Enterprise
-To upgrade Docker EE, download the newer package file and repeat the
-[installation procedure](#install-from-a-package), pointing to the new file.
+To upgrade Docker Engine - Enterprise, download the newer package file and
+repeat the [installation procedure](#install-from-a-package), pointing to the
+new file.
-## Uninstall Docker EE
+## Uninstall Docker Engine - Enterprise
-1. Uninstall the Docker EE package:
+1. Uninstall the Docker Engine - Enterprise package.
```bash
$ sudo apt-get purge docker-ee
@@ -284,7 +296,7 @@ To upgrade Docker EE, download the newer package file and repeat the
2. Images, containers, volumes, or customized configuration files on your host
are not automatically removed. To delete all images, containers, and
- volumes:
+ volumes.
```bash
$ sudo rm -rf /var/lib/docker
diff --git a/install/linux/linux-postinstall.md b/install/linux/linux-postinstall.md
index 117839a8c3..649c852163 100644
--- a/install/linux/linux-postinstall.md
+++ b/install/linux/linux-postinstall.md
@@ -27,6 +27,13 @@ creates a Unix socket accessible by members of the `docker` group.
> [*Docker Daemon Attack Surface*](/engine/security/security.md#docker-daemon-attack-surface).
{: .warning}
+> **Note**:
+>
+> To run Docker without root privileges, see
+> [Run the Docker daemon as a non-root user (Rootless mode)](/engine/security/rootless.md).
+>
+> Rootless mode is currently available as an experimental feature.
+
To create the `docker` group and add your user:
1. Create the `docker` group.
diff --git a/install/windows/docker-ee.md b/install/windows/docker-ee.md
index 51911c3046..2cb318edc0 100644
--- a/install/windows/docker-ee.md
+++ b/install/windows/docker-ee.md
@@ -10,7 +10,11 @@ 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 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.
+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
>
@@ -25,19 +29,20 @@ 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:
+* OS Versions:
- Long Term Service Channel (LTSC) - 2016 and 2019 (Core and GUI)
- Semi-annual Channel (SAC) - 1709, 1803 and 1809
* RAM: 4GB
-* Disk space: [32 GB minimum recommendation for Windows](https://docs.microsoft.com/en-us/windows-server/get-started/system-requirements).
-Docker recommends an additional 32 GB of space for base images for ServerCore
-and NanoServer along with buffer space for workload containers running IIS, SQL Server and .Net apps.
+* Disk space: [32 GB minimum recommendation for Windows](https://docs.microsoft.com/en-us/windows-server/get-started/system-requirements).
+ Docker recommends an additional 32 GB of space 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
To install the Docker Engine - Enterprise on your hosts, Docker provides a
-[OneGet](https://github.com/oneget/oneget) PowerShell Module.
+[OneGet](https://github.com/oneget/oneget) PowerShell Module.
1. Open an elevated PowerShell command prompt, and type the following commands.
@@ -46,7 +51,7 @@ To install the Docker Engine - Enterprise on your hosts, Docker provides a
Install-Package Docker -ProviderName DockerMsftProvider -Force
```
-2. Check if a reboot is required, and if yes, restart your instance:
+2. Check if a reboot is required, and if yes, restart your instance.
```powershell
(Install-WindowsFeature Containers).RestartNeeded
@@ -57,7 +62,7 @@ To install the Docker Engine - Enterprise on your hosts, Docker provides a
Restart-Computer
```
-3. Test your Docker Engine - Enterprise installation by running the
+3. Test your Docker Engine - Enterprise installation by running the
`hello-world` container.
**Windows Server 2019**
@@ -107,19 +112,20 @@ Select option `6) Download and Install Updates`.
140-2](https://csrc.nist.gov/csrc/media/publications/fips/140/2/final/documents/fips1402.pdf)
is a United States Federal security requirement for cryptographic modules.
-With Docker EE Basic license for versions 18.09 and later, Docker provides FIPS
-140-2 support in Windows Server. This includes a FIPS supported cryptographic
-module. If the Windows implementation already has FIPS support enabled, FIPS is
-automatically enabled in the Docker engine.
+With Docker Engine - Enterprise Basic license for versions 18.09 and later,
+Docker provides FIPS 140-2 support in Windows Server. This includes a FIPS
+supported cryptographic module. If the Windows implementation already has FIPS
+support enabled, FIPS is automatically enabled in the Docker engine.
-> **Note**: FIPS 140-2 is only supported in the Docker EE engine. UCP and DTR currently do not have support for FIPS 140-2.
+> **Note:** FIPS 140-2 is only supported in the Docker Engine - Enterprise
+> engine. UCP and DTR currently do not have support for FIPS 140-2.
To enable FIPS 140-2 compliance on a system that is not in FIPS 140-2 mode,
execute the following command in PowerShell:
```powershell
-[System.Environment]::SetEnvironmentVariable("DOCKER_FIPS", "1", "Machine")
+[System.Environment]::SetEnvironmentVariable("DOCKER_FIPS", "1", "Machine")
```
FIPS 140-2 mode may also be enabled via the Windows Registry. To update the
@@ -140,13 +146,16 @@ net start docker
To confirm Docker is running with FIPS-140-2 enabled, run the `docker info` command:
```yaml
-Labels:
- com.docker.security.fips=enabled
+Labels:
+ com.docker.security.fips=enabled
```
-> **Note**: If the system has the FIPS-140-2 cryptographic module installed on the operating system, it is possible to disable FIPS-140-2 compliance. To disable FIPS-140-2 in Docker but not the operating system, set the value `"DOCKER_FIPS","0"` in the `[System.Environment]`.`
+> **Note:** If the system has the FIPS-140-2 cryptographic module installed on
+> the operating system, it is possible to disable FIPS-140-2 compliance. To
+> disable FIPS-140-2 in Docker but not the operating system, set the value
+> `"DOCKER_FIPS","0"` in the `[System.Environment]`.`
-## Use a script to install Docker EE
+## Use a script to install Docker Engine - Enterprise
Use the following guide if you wanted to install the Docker Engine - Enterprise
manually, via a script, or on air-gapped systems.
@@ -159,8 +168,8 @@ manually, via a script, or on air-gapped systems.
Invoke-WebRequest -UseBasicParsing -OutFile {{ filename }} {{ download_url }}
```
- If you need to download a specific Docker EE Engine release, all URLs can be
- found on this [JSON index](https://dockermsft.blob.core.windows.net/dockercontainer/DockerMsftIndex.json)
+ If you need to download a specific Docker Engine - Enterprise Engine
+ release, all URLs can be found on this [JSON index](https://dockermsft.blob.core.windows.net/dockercontainer/DockerMsftIndex.json)
2. Copy the zip file to the machine where you want to install Docker. In a
PowerShell command prompt, use the following commands to extract the archive,
@@ -169,7 +178,7 @@ manually, via a script, or on air-gapped systems.
```powershell
# Stop Docker service
Stop-Service docker
-
+
# Extract the archive.
Expand-Archive {{ filename }} -DestinationPath $Env:ProgramFiles -Force
@@ -197,7 +206,8 @@ manually, via a script, or on air-gapped systems.
Start-Service docker
```
-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.
**Windows Server 2019**
@@ -225,8 +235,8 @@ Docker {{ site.docker_ee_version }} Docker
### Updating the DockerMsftProvider
-Installing specific Docker EE versions may require an update to previously
-installed DockerMsftProvider modules. To update:
+Installing specific Docker Engine - Enterprise versions may require an update to
+previously installed DockerMsftProvider modules. To update:
```powershell
Update-Module DockerMsftProvider
@@ -245,37 +255,37 @@ Install-Package -Name docker -ProviderName DockerMsftProvider -RequiredVersion {
The required version number must match a version available on the [JSON
index](https://dockermsft.blob.core.windows.net/dockercontainer/DockerMsftIndex.json)
-## Uninstall Docker EE
+## Uninstall Docker Engine - Enterprise
- Use the following commands to completely remove the Docker Engine - Enterprise
- from a Windows Server:
+Use the following commands to completely remove the Docker Engine - Enterprise
+from a Windows Server:
-1. Leave any active Docker Swarm
+1. Leave any active Docker Swarm.
```powershell
docker swarm leave --force
```
-1. Remove all running and stopped containers
+2. Remove all running and stopped containers.
```powershell
docker rm -f $(docker ps --all --quiet)
```
-1. Prune container data
+3. Prune container data.
```powershell
docker system prune --all --volumes
```
-1. Uninstall Docker PowerShell Package and Module
+4. Uninstall Docker PowerShell Package and Module.
```powershell
Uninstall-Package -Name docker -ProviderName DockerMsftProvider
Uninstall-Module -Name DockerMsftProvider
```
-
-1. Clean up Windows Networking and file system
+
+5. Clean up Windows Networking and file system.
```powershell
Get-HNSNetwork | Remove-HNSNetwork
@@ -303,8 +313,8 @@ posts](https://www.docker.com/microsoft/) on the Docker website.
## Where to go next
* [Getting started](/docker-for-windows/index.md) provides an overview of
-Docker Desktop for Windows, basic Docker command examples, how to get help or give
-feedback, and links to all topics in the Docker Desktop for Windows guide.
+Docker Desktop for Windows, basic Docker command examples, how to get help or
+give feedback, and links to all topics in the Docker Desktop for Windows guide.
* [FAQs](/docker-for-windows/faqs.md) provides answers to frequently asked
questions.
diff --git a/network/index.md b/network/index.md
index be083b2652..c0c660557b 100644
--- a/network/index.md
+++ b/network/index.md
@@ -100,12 +100,12 @@ exist by default, and provide core networking functionality:
The following two features are only possible when using Docker EE and managing
your Docker services using Universal Control Plane (UCP):
-- The [HTTP routing mesh](/datacenter/ucp/2.2/guides/admin/configure/use-domain-names-to-access-services/)
+- The [HTTP routing mesh](/ee/ucp/interlock)
allows you to share the same network IP address and port among multiple
services. UCP routes the traffic to the appropriate service using the
combination of hostname and port, as requested from the client.
-- [Session stickiness](/datacenter/ucp/2.2/guides/user/services/use-domain-names-to-access-services/#sticky-sessions) allows you to specify information in the HTTP header
+- [Session stickiness](/ee/ucp/interlock/usage/sessions/) allows you to specify information in the HTTP header
which UCP uses to route subsequent requests to the same service task, for
applications which require stateful sessions.
diff --git a/reference.md b/reference.md
index 262229b1a7..39d111dfae 100644
--- a/reference.md
+++ b/reference.md
@@ -18,9 +18,9 @@ various APIs, CLIs, and file formats.
| CLI | Description |
|:--------------------------------------------------------------|:----------------------------------------------------------------------------------------------------------------|
-| [Engine CLI](/engine/reference/commandline/cli/) | The main CLI for Docker, includes all `docker` and [`dockerd`](/engine/reference/commandline/dockerd/) commands |
+| [Docker CLI](/engine/reference/commandline/cli/) | The main CLI for Docker, includes all `docker` commands |
| [Compose CLI](/compose/reference/overview/) | The CLI for Docker Compose, which allows you to build and run multi-container applications |
-| [Machine CLI](/machine/reference/) | Manages virtual machines that are pre-configured to run Docker |
+| [Daemon CLI (dockerd)](/engine/reference/commandline/dockerd/) | Persistent process that manages containers |
| [DTR CLI](/reference/dtr/{{ site.dtr_version }}/cli/index.md) | Deploy and manage Docker Trusted Registry |
| [UCP CLI](/reference/ucp/{{ site.ucp_version }}/cli/index.md) | Deploy and manage Universal Control Plane |
@@ -28,18 +28,17 @@ various APIs, CLIs, and file formats.
| API | Description |
|:------------------------------------------------------|:---------------------------------------------------------------------------------------|
-| [Engine API](/engine/api/) | The main API for Docker, provides programmatic access to a [daemon](/glossary/#daemon) |
-| [Registry API](/registry/spec/api/) | Facilitates distribution of images to the engine |
+| [Engine API](/engine/api/) | The main API for Docker, provides programmatic access to a daemon |
| [DTR API](/reference/dtr/{{ site.dtr_version }}/api/) | Provides programmatic access to a Docker Trusted Registry deployment |
+| [Registry API](/registry/spec/api/) | Facilitates distribution of images to the engine |
+| [Template API](app-template/api-reference)| Allows users to create new Docker applications by using a library of templates.|
| [UCP API](/reference/ucp/{{ site.ucp_version }}/api/) | Provides programmatic access to a Universal Control Plane deployment |
-
## Drivers and specifications
| Driver | Description |
|:-------------------------------------------------------|:-----------------------------------------------------------------------------------|
| [Image specification](/registry/spec/manifest-v2-2/) | Describes the various components of a Docker image |
-| [Machine drivers](/machine/drivers/os-base/) | Enables support for given cloud providers when provisioning resources with Machine |
| [Registry token authentication](/registry/spec/auth/) | Outlines the Docker registry authentication scheme |
| [Registry storage drivers](/registry/storage-drivers/) | Enables support for given cloud providers when storing images with Registry |
diff --git a/storage/tmpfs.md b/storage/tmpfs.md
index fc68f9c285..707c08bda7 100644
--- a/storage/tmpfs.md
+++ b/storage/tmpfs.md
@@ -140,4 +140,4 @@ docker run -d \
- Learn about [volumes](volumes.md)
- Learn about [bind mounts](bind-mounts.md)
-- Learn about [storage drivers](/storage/storagedriver/)
+- Learn about [storage drivers](/storage/storagedriver/)
\ No newline at end of file
diff --git a/test.md b/test.md
index e747cf2620..2ec7be24bc 100644
--- a/test.md
+++ b/test.md
@@ -262,8 +262,8 @@ The glossary source lives in the documentation repository
To update glossary content, edit `_data/glossary.yaml`.
-To link to a glossary term, link to `glossary.md?term=YourGlossaryTerm` (for
-example, [swarm](glossary.md?term=swarm)).
+To link to a glossary term, link to `glossary.md#YourGlossaryTerm` (for
+example, [swarm](glossary.md#swarm)).
## Site-wide variables
@@ -714,7 +714,7 @@ incoming := map[string]interface{}{
```powershell
Install-Module DockerMsftProvider -Force
Install-Package Docker -ProviderName DockerMsftProvider -Force
-[System.Environment]::SetEnvironmentVariable("DOCKER_FIPS", "1", "Machine")
+[System.Environment]::SetEnvironmentVariable("DOCKER_FIPS", "1", "Machine")
Expand-Archive docker-18.09.1.zip -DestinationPath $Env:ProgramFiles -Force
```