docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1189 from docker/aj-name-changes 

Aj name change 1 of 2
This commit is contained in:
Dawn W 2019-06-12 13:08:59 -07:00 committed by GitHub
parent a50fa24ec3 93a2c052be
commit 26499802b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
84 changed files with 574 additions and 932 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -363,7 +363,7 @@ branch](https://github.com/docker/docker.github.io/blob/publish-tools/README.md)
## Creating a new archive
When a new Docker CE Stable version is released, the previous state of `master`
When a new Docker Engine - Community Stable version is released, the previous state of `master`
is archived into a version-specific branch like `v17.09`, by doing the following:
1. Create branch based off the commit hash before the new version was released.

14
_data/glossary.yaml
View File

@ -27,7 +27,7 @@ cgroups: |
*Also known as : control groups*
collection: |
A collection is a group of swarm resources that Docker EE uses for role-based
A collection is a group of swarm resources that Docker Engine - Enterprise uses for role-based
access control. Collections enable organizing permissions for resources like
nodes, services, containers, volumes, networks, and secrets. [Learn how to manage collections](/datacenter/ucp/2.2/guides/access-control/manage-access-with-collections/).
Compose: |
@ -76,8 +76,8 @@ Docker: |
develop, ship, and run applications
- The docker daemon process running on the host which manages images and containers
(also called Docker Engine)
Docker Enterprise Edition: |
Docker Enterprise Edition (Docker EE) is a platform to build, ship, and run
Docker Enterprise: |
Docker Enterprise is a platform to build, ship, and run
containerized applications, that you can deploy in the cloud or on-premise. It
includes a tested and certified version of Docker, web UIs for managing
your app resources, and support.
@ -152,7 +152,7 @@ filesystem: |
- macOS : HFS+
grant: |
A grant enables role-based access control for managing how users and
organizations access Docker EE swarm resources. A grant is made up of a
organizations access Docker Engine - Enterprise swarm resources. A grant is made up of a
subject, a role, and a collection. For more about grants and role-based access
control, see [Grant permissions to users based on roles](/datacenter/ucp/2.2/guides/access-control/grant-permissions/).
image: |
@ -233,12 +233,12 @@ repository: |
Here is an example of the shared [nginx repository](https://hub.docker.com/_/nginx/)
and its [tags](https://hub.docker.com/r/library/nginx/tags/).
role: |
A role is a set of permitted API operations on a collection of Docker EE swarm
A role is a set of permitted API operations on a collection of Docker Engine - Enterprise swarm
resources. As part of a grant, a role is assigned to a subject (a user, team, or
organization) and a collection. For more about roles, see [Roles and
permission levels](/datacenter/ucp/2.2/guides/access-control/permission-levels/).
role-based access control: |
Role-based access control enables managing how Docker EE users can access
Role-based access control enables managing how Docker Engine - Enterprise users can access
swarm resources. UCP administrators create grants to control how users access
resource collections. A grant is made up of a subject, a role, and a collection.
A grant defines who (subject) has how much access (role) to a set of resources
@ -271,7 +271,7 @@ service discovery: |
other services on the same overlay network. The swarm’s internal load balancer
automatically distributes requests to the service VIP among the active tasks.
subject: |
A subject represents a user, team, or organization in Docker EE. A subject is
A subject represents a user, team, or organization in Docker Enterprise. A subject is
granted a role for access to a collection of swarm resources.
For more about role-based access, see [Authentication](/datacenter/ucp/2.2/guides/access-control/).
swarm: |

381
_data/toc.yaml
View File

@ -20,9 +20,9 @@ guides:
section:
- path: /install/overview/
title: Overview of Docker editions
- sectiontitle: Docker Engine - Community
- sectiontitle: Docker CE
section:
- title: About Docker Engine - Community
- title: About Docker CE
path: /install/
- sectiontitle: Cloud
section:
@ -121,7 +121,7 @@ guides:
nosync: true
- sectiontitle: Docker Enterprise
section:
- title: About Docker Enterprise
- title: About Docker Enterpise
path: /ee/supported-platforms/
- sectiontitle: Linux
section:
@ -143,7 +143,7 @@ guides:
- sectiontitle: Compatibility between Docker versions
section:
- path: /engine/ce-ee-node-activate/
title: Docker Engine Community to Enterprise Node Activate
title: CE-EE Node Activate
- path: /engine/migration/
title: Migrate to Docker 1.10
- path: /engine/breaking_changes/
@ -494,16 +494,12 @@ guides:
title: NISTIR 8176
- path: /compliance/nist/itl_october2017/
title: NIST ITL Bulletin October 2017
- sectiontitle: OSCAL
section:
- path: /compliance/oscal
title: OSCAL compliance guidance
- sectiontitle: CIS Benchmarks
section:
- path: /compliance/cis/docker_ee/
title: Docker Enterprise Benchmark
- path: /compliance/cis/docker_ce/
title: Docker Engine - Community Benchmark
title: Docker CE Benchmark
- path: /compliance/cis/k8s/
title: Kubernetes Benchmark
- path: /compliance/fedramp/
@ -614,38 +610,8 @@ reference:
section:
- path: /engine/reference/commandline/builder/
title: docker builder
- path: /engine/reference/commandline/builder_build/
title: docker builder build
- path: /engine/reference/commandline/builder_prune/
title: docker builder prune
- sectiontitle: docker buildx *
section:
- path: /engine/reference/commandline/buildx/
title: docker buildx
- path: /engine/reference/commandline/buildx_bake/
title: docker buildx bake
- path: /engine/reference/commandline/buildx_build/
title: docker buildx build
- path: /engine/reference/commandline/buildx_create/
title: docker buildx create
- path: /engine/reference/commandline/buildx_imagetools/
title: docker buildx imagetools
- path: /engine/reference/commandline/buildx_imagetools_create/
title: docker buildx imagetools create
- path: /engine/reference/commandline/buildx_imagetools_inspect/
title: docker buildx imagetools inspect
- path: /engine/reference/commandline/buildx_inspect/
title: docker buildx inspect
- path: /engine/reference/commandline/buildx_ls/
title: docker buildx ls
- path: /engine/reference/commandline/buildx_rm/
title: docker buildx rm
- path: /engine/reference/commandline/buildx_stop/
title: docker buildx stop
- path: /engine/reference/commandline/buildx_use/
title: docker buildx use
- path: /engine/reference/commandline/buildx_version/
title: docker buildx version
- sectiontitle: docker checkpoint *
section:
- path: /engine/reference/commandline/checkpoint/
@ -724,26 +690,6 @@ reference:
title: docker container update
- path: /engine/reference/commandline/container_wait/
title: docker container wait
- sectiontitle: docker context *
section:
- path: /engine/reference/commandline/context/
title: docker context
- path: /engine/reference/commandline/context_create/
title: docker context create
- path: /engine/reference/commandline/context_export/
title: docker context export
- path: /engine/reference/commandline/context_import/
title: docker context import
- path: /engine/reference/commandline/context_inspect/
title: docker context inspect
- path: /engine/reference/commandline/context_ls/
title: docker context ls
- path: /engine/reference/commandline/context_rm/
title: docker context rm
- path: /engine/reference/commandline/context_update/
title: docker context update
- path: /engine/reference/commandline/context_use/
title: docker context use
- path: /engine/reference/commandline/cp/
title: docker cp
- path: /engine/reference/commandline/create/
@ -896,24 +842,6 @@ reference:
title: docker pull
- path: /engine/reference/commandline/push/
title: docker push
- sectiontitle: docker registry *
section:
- path: /engine/reference/commandline/registry/
title: docker registry
- path: /engine/reference/commandline/registry_events/
title: docker registry events
- path: /engine/reference/commandline/registry_history/
title: docker registry history
- path: /engine/reference/commandline/registry_info/
title: docker registry info
- path: /engine/reference/commandline/registry_inspect/
title: docker registry inspect
- path: /engine/reference/commandline/registry_joblogs/
title: docker registry joblogs
- path: /engine/reference/commandline/registry_ls/
title: docker registry ls
- path: /engine/reference/commandline/registry_rmi/
title: docker registry rmi
- path: /engine/reference/commandline/rename/
title: docker rename
- path: /engine/reference/commandline/restart/
@ -1014,24 +942,6 @@ reference:
title: docker system prune
- path: /engine/reference/commandline/tag/
title: docker tag
- sectiontitle: docker template *
section:
- path: /engine/reference/commandline/template/
title: docker template
- path: /engine/reference/commandline/template_config/
title: docker template config
- path: /engine/reference/commandline/template_config_set/
title: docker template config set
- path: /engine/reference/commandline/template_config_view/
title: docker template config view
- path: /engine/reference/commandline/template_inspect/
title: docker template inspect
- path: /engine/reference/commandline/template_list/
title: docker template list
- path: /engine/reference/commandline/template_scaffold/
title: docker template scaffold
- path: /engine/reference/commandline/template_version/
title: docker template version
- path: /engine/reference/commandline/top/
title: docker top
- sectiontitle: docker trust *
@ -1086,53 +996,53 @@ reference:
nosync: true
- sectiontitle: DTR CLI
section:
- path: /reference/dtr/2.7/cli/
- path: /reference/dtr/2.6/cli/
title: Overview
- path: /reference/dtr/2.7/cli/backup/
- path: /reference/dtr/2.6/cli/backup/
title: backup
- path: /reference/dtr/2.7/cli/destroy/
- path: /reference/dtr/2.6/cli/destroy/
title: destroy
- path: /reference/dtr/2.7/cli/emergency-repair/
title: emergency-repair7
- path: /reference/dtr/2.7/cli/install/
- path: /reference/dtr/2.6/cli/emergency-repair/
title: emergency-repair
- path: /reference/dtr/2.6/cli/install/
title: install
- path: /reference/dtr/2.7/cli/join/
- path: /reference/dtr/2.6/cli/join/
title: join
- path: /reference/dtr/2.7/cli/reconfigure/
- path: /reference/dtr/2.6/cli/reconfigure/
title: reconfigure
- path: /reference/dtr/2.7/cli/remove/
- path: /reference/dtr/2.6/cli/remove/
title: remove
- path: /reference/dtr/2.7/cli/restore/
- path: /reference/dtr/2.6/cli/restore/
title: restore
- path: /reference/dtr/2.7/cli/upgrade/
- path: /reference/dtr/2.6/cli/upgrade/
title: upgrade
- sectiontitle: UCP CLI
section:
- path: /reference/ucp/3.2/cli/
- path: /reference/ucp/3.1/cli/
title: docker/ucp overview
- path: /reference/ucp/3.2/cli/backup/
- path: /reference/ucp/3.1/cli/backup/
title: backup
- path: /reference/ucp/3.2/cli/dump-certs/
- path: /reference/ucp/3.1/cli/dump-certs/
title: dump-certs
- path: /reference/ucp/3.2/cli/example-config/
- path: /reference/ucp/3.1/cli/example-config/
title: example-config
- path: /reference/ucp/3.2/cli/id/
- path: /reference/ucp/3.1/cli/id/
title: id
- path: /reference/ucp/3.2/cli/images/
- path: /reference/ucp/3.1/cli/images/
title: images
- path: /reference/ucp/3.2/cli/install/
- path: /reference/ucp/3.1/cli/install/
title: install
- path: /reference/ucp/3.2/cli/restart/
- path: /reference/ucp/3.1/cli/restart/
title: restart
- path: /reference/ucp/3.2/cli/restore/
- path: /reference/ucp/3.1/cli/restore/
title: restore
- path: /reference/ucp/3.2/cli/stop/
- path: /reference/ucp/3.1/cli/stop/
title: stop
- path: /reference/ucp/3.2/cli/support/
- path: /reference/ucp/3.1/cli/support/
title: support
- path: /reference/ucp/3.2/cli/uninstall-ucp/
- path: /reference/ucp/3.1/cli/uninstall-ucp/
title: uninstall-ucp
- path: /reference/ucp/3.2/cli/upgrade/
- path: /reference/ucp/3.1/cli/upgrade/
title: upgrade
- sectiontitle: Application Programming Interfaces (APIs)
@ -1192,9 +1102,9 @@ reference:
- path: /engine/api/v1.18/
title: v1.18 reference
- title: DTR API
path: /reference/dtr/2.7/api/
path: /reference/dtr/2.6/api/
- title: UCP API
path: /reference/ucp/3.2/api/
path: /reference/ucp/3.1/api/
- title: Registry API
path: /registry/spec/api/
nosync: true
@ -1290,101 +1200,25 @@ manuals:
section:
- path: /ee/
title: About Docker Enterprise
- sectiontitle: Release Notes
section:
- path: /ee/release-notes/
title: Platform
- path: /engine/release-notes/
title: Docker Engine - Enterprise and Engine - Community
nosync: true
- path: /ee/ucp/release-notes/
title: Docker Universal Control Plane
nosync: true
- path: /ee/dtr/release-notes/
title: Docker Trusted Registry
nosync: true
- path: /ee/desktop/release-notes/
title: Docker Desktop Enterprise
nosync: true
- path: /ee/docker-ee-architecture/
title: Docker Enterprise Architecture
- title: Try Docker Enterprise on the cloud
path: https://trial.docker.com
- path: /ee/supported-platforms/
title: Supported platforms
nosync: true
- sectiontitle: Deploy Docker Enterprise
section:
- sectiontitle: Docker Cluster
section:
- path: /cluster/overview/
title: Overview
- path: /cluster/aws/
title: Docker Cluster on AWS
- path: /cluster/cluster-file/
title: Cluster file structure
- path: /cluster/reference/
title: Subcommands
- path: /cluster/reference/envvars/
title: Environment variables
- path: /ee/end-to-end-install/
title: Install components individually
- sectiontitle: Back up Docker Enterprise
section:
- path: /ee/admin/backup/
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: /cluster/reference/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/
title: Overview
nosync: true
- path: /ee/end-to-end-install/
title: Deploy Docker Enterprise standard
- path: /ee/backup/
title: Backup Docker Enterprise
- path: /ee/upgrade/
title: Upgrade Docker Enterprise
- sectiontitle: Docker Cluster
section:
- path: /cluster/overview/
title: Overview
- path: /cluster/aws/
title: Docker Cluster on AWS
- path: /cluster/cluster-file/
title: Cluster file structure
- path: /cluster/reference/
title: Subcommands
- path: /cluster/reference/envvars/
title: Environment variables
- path: /cluster/reference/ls/
title: List clusters
- path: /cluster/reference/inspect/
title: Inspect clusters
- path: /cluster/reference/update/
title: Update clusters
- path: /cluster/reference/remove/
title: Remove clusters
- path: /cluster/reference/version/
title: Version information
- path: /ee/docker-ee-architecture/
title: Docker Enterpris Architecture
- path: /ee/telemetry/
title: Manage usage data collection
- sectiontitle: Docker Engine - Enterprise
section:
- path: /ee/supported-platforms/
title: Install Docker Enterprise Engine
title: Install Docker Engine - Enterprise
nosync: true
- title: Release notes
path: /engine/release-notes/
@ -1408,8 +1242,6 @@ manuals:
title: Install offline
- path: /ee/ucp/admin/install/install-on-azure/
title: Install on Azure
- path: /ee/ucp/admin/install/install-on-aws/
title: Install on AWS
- path: /ee/ucp/admin/install/upgrade/
title: Upgrade
- path: /ee/ucp/admin/install/upgrade-offline/
@ -1434,8 +1266,6 @@ manuals:
title: Create UCP audit logs
- path: /ee/ucp/admin/configure/enable-saml-authentication/
title: Enable SAML authentication
- path: /ee/ucp/admin/configure/integrate-scim/
title: SCIM integration
- path: /ee/ucp/admin/configure/enable-helm-tiller/
title: Enable Helm and Tiller with UCP
- path: /ee/ucp/admin/configure/external-auth/
@ -1482,6 +1312,8 @@ manuals:
title: Troubleshoot with logs
- path: /ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-configurations/
title: Troubleshoot configurations
- path: /ee/ucp/admin/backups-and-disaster-recovery/
title: Backups and disaster recovery
- title: CLI reference
path: /reference/ucp/3.1/cli/
nosync: true
@ -1577,12 +1409,6 @@ manuals:
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
path: /ee/ucp/interlock/usage/interlock-vip-mode/
- title: Using routing labels
path: /ee/ucp/interlock/usage/labels-reference.md/
- title: Implementing redirects
path: /ee/ucp/interlock/usage/redirects/
- title: Implementing a service cluster
@ -1592,7 +1418,7 @@ manuals:
- title: Securing services with TLS
path: /ee/ucp/interlock/usage/tls/
- title: Configuring websockets
path: /ee/ucp/interlock/usage/websockets/
path: /ee/ucp/interlock/usage/websockets/
- sectiontitle: Deploy apps with Kubernetes
section:
- title: Access Kubernetes Resources
@ -1611,8 +1437,6 @@ manuals:
path: /ee/ucp/kubernetes/install-cni-plugin/
- title: Kubernetes network encryption
path: /ee/ucp/kubernetes/kubernetes-network-encryption/
- title: Deploy a CSI plugin
path: /ee/ucp/kubernetes/use-csi/
- sectiontitle: Persistent Storage
section:
- title: Use NFS Storage
@ -1622,11 +1446,9 @@ manuals:
- title: Use Azure Files Storage
path: /ee/ucp/kubernetes/storage/use-azure-files/
- title: Use AWS EBS Storage
path: /ee/ucp/kubernetes/storage/configure-aws-storage/
- title: Configure iSCSI
path: /ee/ucp/kubernetes/storage/use-iscsi/
path: /ee/ucp/kubernetes/storage/configure-aws-storage/
- title: API reference
path: /reference/ucp/3.2/api/
path: /reference/ucp/3.1/api/
nosync: true
- path: /ee/ucp/release-notes/
title: Release notes
@ -2495,7 +2317,7 @@ manuals:
- title: Restore from a backup
path: /ee/dtr/admin/disaster-recovery/restore-from-backup/
- title: CLI reference
path: /reference/dtr/2.7/cli/
path: /reference/dtr/2.6/cli/
nosync: true
- sectiontitle: User guides
section:
@ -2554,7 +2376,7 @@ manuals:
- title: Tag pruning
path: /ee/dtr/user/tag-pruning/
- title: API reference
path: /reference/dtr/2.7/api/
path: /reference/dtr/2.6/api/
nosync: true
- path: /ee/dtr/release-notes/
title: Release notes
@ -3324,68 +3146,8 @@ manuals:
title: API v1.3.3
- path: /datacenter/dtr/2.0/support/
title: Get support
- sectiontitle: Docker Desktop Enterprise
section:
- path: /ee/desktop/
title: Overview
- path: /ee/desktop/release-notes/
title: Release notes
- sectiontitle: Admin
section:
- sectiontitle: Install
section:
- path: /ee/desktop/admin/install/mac/
title: Install DDE on Mac
- path: /ee/desktop/admin/install/windows/
title: Install DDE on Windows
- sectiontitle: Configure
section:
- path: /ee/desktop/admin/configure/mac-admin/
title: Configure DDE on Mac
- path: /ee/desktop/admin/configure/windows-admin/
title: Configure DDE on Windows
- sectiontitle: User
section:
- path: /ee/desktop/user/mac-user/
title: Use DDE on Mac
- path: /ee/desktop/user/windows-user/
title: Use DDE on Windows
- path: /ee/desktop/app-designer/
title: Application designer
- sectiontitle: Troubleshoot
section:
- path: /ee/desktop/troubleshoot/mac-issues/
title: Troubleshoot DDE issues on Mac
- path: /ee/desktop/troubleshoot/windows-issues/
title: Troubleshoot DDE issues on Windows
- title: Get support
path: /ee/get-support/
- sectiontitle: Docker Assemble
section:
- path: /assemble/install/
title: Install
- path: /assemble/spring-boot/
title: Build a Spring Boot project
- path: /assemble/dot-net/
title: Build a C# ASP.NET Core project
- path: /assemble/configure/
title: Configure
- path: /assemble/images/
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 Buildx
section:
- path: /buildx/working-with-buildx/
title: Working with Docker Buildx
- sectiontitle: Docker Compose
section:
- path: /compose/overview/
@ -3484,20 +3246,6 @@ manuals:
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
- 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 Desktop for Mac
section:
- path: /docker-for-mac/
@ -3802,22 +3550,14 @@ manuals:
section:
- path: /release-notes/
title: Overview
- sectiontitle: Docker Enterprise Platform
section:
- path: /ee/release-notes/
title: Platform
- path: /engine/release-notes/
title: Docker Engine - Enterprise and Engine - Community
nosync: true
- path: /ee/ucp/release-notes/
title: Docker Universal Control Plane
nosync: true
- path: /ee/dtr/release-notes/
title: Docker Trusted Registry
nosync: true
- path: /ee/desktop/release-notes/
title: Docker Desktop Enterprise
nosync: true
- path: /engine/release-notes/
title: Docker Enterprise and Docker Engine - Community
nosync: true
- path: /cs-engine/1.13/release-notes/
title: CS Docker Engine
nosync: true
- path: /release-notes/docker-engine/
title: Docker (1.13 and earlier)
- path: /docker-for-mac/release-notes/
title: Docker Desktop for Mac
nosync: true
@ -3833,17 +3573,14 @@ manuals:
- path: /docker-for-azure/release-notes/
title: Docker for Azure
nosync: true
- path: /release-notes/docker-machine/
title: Docker Machine release notes
nosync: true
- path: /release-notes/docker-swarm/
title: Docker Swarm release notes
nosync: true
- sectiontitle: Superseded products and tools
section:
- path: /cs-engine/1.13/release-notes/
title: CS Docker Engine
- path: /release-notes/docker-engine/
title: Docker (1.13 and earlier)
- path: /release-notes/docker-machine/
title: Docker Machine
- sectiontitle: Docker Swarm (standalone)
section:
- path: /swarm/overview/

42
_includes/ee-linux-install-reuse.md
View File

@ -12,23 +12,23 @@ Usage: {% include ee-linux-install-reuse.md section="ee-install-intro" %}
{% if section == "ee-install-intro" %}
There are two ways to install and upgrade [Docker Enterprise Edition (Docker EE)](https://www.docker.com/enterprise-edition/){: target="_blank" class="_" }
There are two ways to install and upgrade [Docker Enterprise](https://www.docker.com/enterprise-edition/){: target="_blank" class="_" }
on {{ linux-dist-long }}:
- [YUM repository](#repo-install-and-upgrade): Set up a Docker repository and install Docker EE from it. This is the recommended approach because installation and upgrades are managed with YUM and easier to do.
- [YUM repository](#repo-install-and-upgrade): Set up a Docker repository and install Docker Engine - Enterprise from it. This is the recommended approach because installation and upgrades are managed with YUM and easier to do.
- [RPM package](#package-install-and-upgrade): Download the {{ package-format }} package, install it manually, and manage upgrades manually. This is useful when installing Docker EE on air-gapped systems with no access to the internet.
- [RPM package](#package-install-and-upgrade): Download the {{ package-format }} package, install it manually, and manage upgrades manually. This is useful when installing Docker Engine - Enterprise on air-gapped systems with no access to the internet.
{% if linux-dist == "rhel" or linux-dist == "oraclelinux" %}
Docker Community Edition (Docker CE) is _not_ supported on {{ linux-dist-long }}.
Docker Engine - Community is _not_ supported on {{ linux-dist-long }}.
{% endif %}
{% if linux-dist == "centos" %}
For Docker Community Edition on {{ linux-dist-cap }}, see [Get Docker CE for CentOS](/install/linux/docker-ce/centos.md).
For Docker Community Edition on {{ linux-dist-cap }}, see [Get Docker Engine - Community for CentOS](/install/linux/docker-ce/centos.md).
{% endif %}
{% elsif section == "find-ee-repo-url" %}
To install Docker EE, you will need the URL of the Docker EE repository associated with your trial or subscription:
To install Docker Enterprise, you will need the URL of the Docker Enterprise repository associated with your trial or subscription:
1. Go to [https://hub.docker.com/my-content](https://hub.docker.com/my-content){: target="_blank" class="_" }. All of your subscriptions and trials are listed.
2. Click the **Setup** button for **Docker Enterprise Edition for {{ linux-dist-long }}**.
@ -39,11 +39,11 @@ You will use this URL in a later step to create a variable called, `DOCKERURL`.
{% elsif section == "using-yum-repo" %}
The advantage of using a repository from which to install Docker EE (or any software) is that it provides a certain level of automation. RPM-based distributions such as {{ linux-dist-long }}, use a tool called YUM that work with your repositories to manage dependencies and provide automatic updates.
The advantage of using a repository from which to install Docker Engine - Enterprise (or any software) is that it provides a certain level of automation. RPM-based distributions such as {{ linux-dist-long }}, use a tool called YUM that work with your repositories to manage dependencies and provide automatic updates.
{% elsif section == "set-up-yum-repo" %}
You only need to set up the repository once, after which you can install Docker EE _from_ the repo and repeatedly upgrade as necessary.
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.
1. Remove existing Docker repositories from `/etc/yum.repos.d/`:
@ -126,7 +126,7 @@ You only need to set up the repository once, after which you can install Docker
{% endif %}
6. Add the Docker EE **stable** repository:
6. Add the Docker Engine - Enterprise **stable** repository:
```bash
$ sudo -E yum-config-manager \
@ -137,8 +137,8 @@ You only need to set up the repository once, after which you can install Docker
{% elsif section == "install-using-yum-repo" %}
> **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
> **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,
> UCP, and DTR).
@ -151,7 +151,7 @@ You only need to set up the repository once, after which you can install Docker
If prompted to accept the GPG key, verify that the fingerprint matches `{{ gpg-fingerprint }}`, and if so, accept it.
2. To install a _specific version_ of Docker EE (recommended in production), list versions and install:
2. To install a _specific version_ of Docker Engine - Enterprise (recommended in production), list versions and install:
a. List and sort the versions available in your repo. This example sorts results by version number, highest to lowest, and is truncated:
@ -185,7 +185,7 @@ You only need to set up the repository once, after which you can install Docker
$ sudo systemctl start docker
```
4. Verify that Docker EE is installed correctly by running the `hello-world`
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:
@ -193,7 +193,7 @@ You only need to set up the repository once, after which you can install Docker
$ sudo docker run hello-world
```
Docker EE is installed and running. Use `sudo` to run Docker commands. See
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.
@ -207,7 +207,7 @@ You only need to set up the repository once, after which you can install Docker
{% elsif section == "package-installation" %}
To manually install Docker EE, download the `.{{ package-format | downcase }}` file for your release. You need to download a new file each time you want to upgrade Docker EE.
To manually install Docker Enterprise, download the `.{{ package-format | downcase }}` file for your release. You need to download a new file each time you want to upgrade Docker Enterprise.
{% elsif section == "install-using-yum-package" %}
@ -222,13 +222,13 @@ To manually install Docker EE, download the `.{{ package-format | downcase }}` f
{% endif %}
{% if linux-dist == "centos" %}
1. Go to the Docker EE repository URL associated with your trial or subscription
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-<VERSION>/Packages`
and download the `.{{ package-format | downcase }}` file for the Docker version you want to install.
{% endif %}
{% if linux-dist == "rhel" or linux-dist == "oraclelinux" %}
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
`{{ linux-dist-url-slug }}/`. Choose your {{ linux-dist-long }} version,
architecture, and Docker version. Download the
@ -240,7 +240,7 @@ To manually install Docker EE, download the `.{{ package-format | downcase }}` f
{% endif %}
{% endif %}
2. Install Docker EE, changing the path below to the path where you downloaded
2. Install Docker Enterprise, changing the path below to the path where you downloaded
the Docker package.
```bash
@ -258,7 +258,7 @@ To manually install Docker EE, download the `.{{ package-format | downcase }}` f
$ sudo systemctl start docker
```
4. Verify that Docker EE is installed correctly by running the `hello-world`
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:
@ -266,7 +266,7 @@ To manually install Docker EE, download the `.{{ package-format | downcase }}` f
$ sudo docker run hello-world
```
Docker EE is installed and running. Use `sudo` to run Docker commands. See
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.
@ -281,7 +281,7 @@ To manually install Docker EE, download the `.{{ package-format | downcase }}` f
{% elsif section == "yum-uninstall" %}
1. Uninstall the Docker EE package:
1. Uninstall the Docker Engine - Enterprise package:
```bash
$ sudo yum -y remove docker-ee

8
_includes/install-script.md
View File

@ -1,10 +1,10 @@
<!-- This file is included in Docker CE or EE installation docs for Linux. -->
<!-- This file is included in Docker Engine - Community or EE installation docs for Linux. -->
### Install using the convenience script
Docker provides convenience scripts at [get.docker.com](https://get.docker.com/)
and [test.docker.com](https://test.docker.com/) for installing edge and
testing versions of Docker CE into development environments quickly and
testing versions of Docker Engine - Community into development environments quickly and
non-interactively. The source code for the scripts is in the
[`docker-install` repository](https://github.com/docker/docker-install).
**Using these scripts is not recommended for production
@ -27,7 +27,7 @@ them:
host machine using another mechanism.
This example uses the script at [get.docker.com](https://get.docker.com/) to
install the latest release of Docker CE on Linux. To install the latest
install the latest release of Docker Engine - Community on Linux. To install the latest
testing version, use [test.docker.com](https://test.docker.com/) instead. In
each of the commands below, replace each occurrence of `get` with `test`.
@ -61,7 +61,7 @@ Remember to log out and back in for this to take effect!
> for more information.
{:.warning}
Docker CE is installed. It starts automatically on `DEB`-based distributions. On
Docker Engine - Community is installed. It starts automatically on `DEB`-based distributions. On
`RPM`-based distributions, you need to start it manually using the appropriate
`systemctl` or `service` command. As the message indicates, non-root users can't
run Docker commands by default.

2
config/daemon/index.md
View File

@ -291,7 +291,7 @@ The Docker daemon log can be viewed by using one of the following methods:
- By running `journalctl -u docker.service` on Linux systems using `systemctl`
- `/var/log/messages`, `/var/log/daemon.log`, or `/var/log/docker.log` on older
Linux systems
- By running `Get-EventLog -LogName Application -Source Docker -After (Get-Date).AddMinutes(-5) | Sort-Object Time | Export-CSV ~/last5minutes.CSV` on Docker EE for Windows Server
- By running `Get-EventLog -LogName Application -Source Docker -After (Get-Date).AddMinutes(-5) | Sort-Object Time | Export-CSV ~/last5minutes.CSV` on Docker Engine - Enterprise for Windows Server
> **Note**: It is not possible to manually generate a stack trace on Docker Desktop for
> Mac or Docker Desktop for Windows. However, you can click the Docker taskbar icon and

2
datacenter/dtr/2.2/guides/admin/configure/set-up-vulnerability-scans.md
View File

@ -149,7 +149,7 @@ To update the CVE database for your DTR instance when it cannot contact the upda
2. In the top right corner, click your user account icon, and select **My Content**.
3. If necessary, select an organization account from the **Accounts** menu at the upper right.
4. Locate your Docker EE Advanced subscription or trial.
4. Locate your Docker Enterprise Advanced subscription or trial.
5. Click **Setup**.
![](../../images/cve-file-1.png){: .with-border}

2
datacenter/dtr/2.3/guides/admin/configure/set-up-vulnerability-scans.md
View File

@ -148,7 +148,7 @@ To update the CVE database for your DTR instance when it cannot contact the upda
2. In the top right corner, click your user account icon, and select **My Content**.
3. If necessary, select an organization account from the **Accounts** menu at the upper right.
4. Locate your Docker EE Advanced subscription or trial.
4. Locate your Docker Enterprise Advanced subscription or trial.
5. Click **Setup** button.
![](../../images/security-scanning-setup-6.png){: .with-border}

2
datacenter/dtr/2.4/guides/admin/configure/set-up-vulnerability-scans.md
View File

@ -150,7 +150,7 @@ To update the CVE database for your DTR instance when it cannot contact the upda
2. In the top right corner, click your user account icon, and select **My Content**.
3. If necessary, select an organization account from the **Accounts** menu at the upper right.
4. Locate your Docker EE Advanced subscription or trial.
4. Locate your Docker Enterprise Advanced subscription or trial.
5. Click **Setup** button.
![](../../images/security-scanning-setup-6.png){: .with-border}

2
datacenter/dtr/2.5/guides/admin/configure/set-up-vulnerability-scans.md
View File

@ -150,7 +150,7 @@ To update the CVE database for your DTR instance when it cannot contact the upda
2. In the top right corner, click your user account icon, and select **My Content**.
3. If necessary, select an organization account from the **Accounts** menu at the upper right.
4. Locate your Docker EE Advanced subscription or trial.
4. Locate your Docker Enterprise Advanced subscription or trial.
5. Click **Setup** button.
![](../../images/security-scanning-setup-6.png){: .with-border}

4
datacenter/ucp/2.0/guides/configuration/index.md
View File

@ -1,8 +1,8 @@
---
---
title: Use externally-signed certificates
description: Learn how to configure Docker Universal Control Plane to use your own
certificates.
keywords: Universal Control Plane, UCP, certificate, authentication, tls
title: Use externally-signed certificates
---
All UCP services are exposed using HTTPS, to ensure all communications between

2
datacenter/ucp/2.0/guides/configuration/integrate-with-dtr.md
View File

@ -139,4 +139,4 @@ steps as you used to configure your local computer.
## Where to go next
* [use your own externally-signed TLS certificates](index.md#customize-the-ucp-tls-certificates)
* [Use your own externally-signed TLS certificates](/datacenter/ucp/2.0/guides/configuration/index.md#customize-the-ucp-tls-certificates)

2
datacenter/ucp/2.2/guides/access-control/index.md
View File

@ -50,7 +50,7 @@ roles by navigating to the **Roles** page.
## Resource collections
Docker EE enables controlling access to swarm resources by using
Docker Enterprise enables controlling access to swarm resources by using
*collections*. A collection is a grouping of swarm cluster resources that you
access by specifying a directory-like path.

2
datacenter/ucp/2.2/guides/access-control/manage-access-with-collections.md
View File

@ -4,7 +4,7 @@ description: Use collections to enable access control for worker nodes and conta
keywords: ucp, grant, role, permission, authentication, resource collection
---
Docker EE enables controlling access to container resources by using
Docker Enterprise enables controlling access to container resources by using
*collections*. A collection is a group of swarm resources,
like services, containers, volumes, networks, and secrets.

2
datacenter/ucp/2.2/guides/access-control/permission-levels.md
View File

@ -76,4 +76,4 @@ the grants that use the role.
* [Create and manage users](create-and-manage-users.md)
* [Create and manage teams](create-and-manage-teams.md)
* [Docker Reference Architecture: Securing Docker EE and Security Best Practices](https://success.docker.com/Architecture/Docker_Reference_Architecture%3A_Securing_Docker_EE_and_Security_Best_Practices)
* [Docker Reference Architecture: Securing Docker Enterprise and Security Best Practices](https://success.docker.com/Architecture/Docker_Reference_Architecture%3A_Securing_Docker_EE_and_Security_Best_Practices)

8
datacenter/ucp/2.2/guides/admin/backups-and-disaster-recovery.md
View File

@ -17,7 +17,7 @@ UCP maintains data about:
| Data | Description |
|:----------------------|:---------------------------------------------------------------------------------------------------------------------|
| Configurations | The UCP cluster configurations, as shown by `docker config ls`, including Docker EE license and swarm and client CAs |
| Configurations | The UCP cluster configurations, as shown by `docker config ls`, including Docker Enterprise license and swarm and client CAs |
| Access control | Permissions for teams to swarm resources, including collections, grants, and roles |
| Certificates and keys | The certificates, public keys, and private keys that are used for authentication and mutual TLS communication |
| Metrics data | Monitoring data gathered by UCP |
@ -29,7 +29,7 @@ This data is persisted on the host running UCP, using named volumes.
## Backup steps
Back up your Docker EE components in the following order:
Back up your Docker Enterprise components in the following order:
1. [Back up your swarm](/engine/swarm/admin_guide/#back-up-the-swarm)
2. Back up UCP
@ -92,7 +92,7 @@ $ gpg --decrypt /tmp/backup.tar | tar --list
### Security-Enhanced Linux (SELinux)
For Docker EE 17.06 or higher, if the Docker engine has SELinux enabled,
For Docker Enterprise 17.06 or higher, if the Docker engine has SELinux enabled,
which is typical for RHEL hosts, you need to include `--security-opt label=disable`
in the `docker` command:
@ -149,7 +149,7 @@ UCP restore recovers the following assets from the backup file:
* Users, teams, and permissions.
* All UCP configuration options available under `Admin Settings`, like the
Docker EE subscription license, scheduling options, content trust, and
Docker Enterpirise subscription license, scheduling options, content trust, and
authentication backends.
UCP restore does not include swarm assets such as cluster membership, services, networks,

10
datacenter/ucp/2.2/guides/admin/configure/join-windows-worker-nodes.md
View File

@ -10,7 +10,7 @@ are supported on Windows, and all manager nodes in the swarm must run on Linux.
Follow these steps to enable a worker node on Windows.
1. Install UCP on a Linux distribution.
2. Install Docker Enterprise Edition (*Docker EE*) on Windows Server 2016.
2. Install Docker Enterprise on Windows Server 2016.
3. Configure the Windows node.
4. Join the Windows node to the swarm.
@ -18,11 +18,11 @@ Follow these steps to enable a worker node on Windows.
Install UCP on a Linux distribution.
[Learn how to install UCP on production](../install/index.md).
UCP requires Docker EE version 17.06 or later.
UCP requires Docker Enterprise version 17.06 or later.
## Install Docker EE on Windows Server 2016
## Install Docker Enterprise on Windows Server 2016
[Install Docker EE](/docker-ee-for-windows/install/#using-a-script-to-install-docker-ee)
[Install Docker Enterprise](/docker-ee-for-windows/install/#using-a-script-to-install-docker-ee)
on a Windows Server 2016 instance to enable joining a swarm that's managed by
UCP.
@ -137,7 +137,7 @@ docker container run --rm {{ page.ucp_org }}/ucp-agent-win:{{ page.ucp_version }
### Open ports in the Windows firewall
UCP and Docker EE require that ports 2376 and 12376 are open for inbound
UCP and Docker Enterprise require that ports 2376 and 12376 are open for inbound
TCP traffic.
In a PowerShell terminal running as Administrator, run these commands

2
datacenter/ucp/2.2/guides/admin/configure/scale-your-cluster.md
View File

@ -95,7 +95,7 @@ To promote or demote a manager node:
4. Click **Save** and wait until the operation completes.
5. Navigate to the **Nodes** page, and confirm that the node role has changed.
If you're load-balancing user requests to Docker EE across multiple manager
If you're load-balancing user requests to Docker Enterprise across multiple manager
nodes, don't forget to remove these nodes from your load-balancing pool when
you demote them to workers.

2
datacenter/ucp/2.2/guides/admin/install/architecture-specific-images.md
View File

@ -1,7 +1,7 @@
---
title: Architecture-specific images
description: Learn how to use images that are specific to particular hardware architectures in Docker Universal Control Plane.
keywords: UCP, Docker EE, image, IBM z, Windows
keywords: UCP, Docker Enterprise, image, IBM z, Windows
---
Docker Universal Control Plane deploys images for a number of different

12
datacenter/ucp/2.2/guides/admin/install/index.md
View File

@ -1,7 +1,7 @@
---
title: Install UCP for production
description: Learn how to install Docker Universal Control Plane on production.
keywords: Universal Control Plane, UCP, install, Docker EE
keywords: Universal Control Plane, UCP, install, Docker Enterprise
---
Docker Universal Control Plane (UCP) is a containerized application that you
@ -14,18 +14,18 @@ of the [requirements UCP needs to run](system-requirements.md).
Also, you need to ensure that all nodes, physical and virtual, are running
the same version of Docker Enterprise Edition.
## Step 2: Install Docker EE on all nodes
## Step 2: Install Docker Enterprise on all nodes
UCP is a containerized application that requires the commercially supported
Docker Engine to run.
Install Docker EE on each host that you plan to manage with UCP.
Install Docker Enterprise on each host that you plan to manage with UCP.
View the [supported platforms](/install/index.md#supported-platforms)
and click on your platform to get platform-specific instructions for installing
Docker EE.
Docker Enterprise.
Make sure you install the same Docker EE version on all the nodes. Also,
if you're creating virtual machine templates with Docker EE already
Make sure you install the same Docker Enterprise version on all the nodes. Also,
if you're creating virtual machine templates with Docker Enterprise already
installed, make sure the `/etc/docker/key.json` file is not included in the
virtual machine image. When provisioning the virtual machine, restart the Docker
daemon to generate a new `/etc/docker/key.json` file.

2
datacenter/ucp/2.2/guides/admin/install/install-offline.md
View File

@ -2,7 +2,7 @@
title: Install UCP offline
description: Learn how to install Docker Universal Control Plane. on a machine with
no internet access.
keywords: UCP, install, offline, Docker EE
keywords: UCP, install, offline, Docker Enterprise
---
The procedure to install Docker Universal Control Plane on a host is the same,

4
datacenter/ucp/2.2/guides/admin/install/plan-installation.md
View File

@ -1,7 +1,7 @@
---
title: Plan a production UCP installation
description: Learn about the Docker Universal Control Plane architecture, and the requirements to install it on production.
keywords: UCP, install, Docker EE
keywords: UCP, install, Docker Enterprise
---
Docker Universal Control Plane helps you manage your container swarm from a
@ -18,7 +18,7 @@ machines) that UCP manages:
## Hostname strategy
Docker UCP requires Docker Enterprise Edition. Before installing Docker EE on
Docker UCP requires Docker Enterprise Edition. Before installing Docker Enterprise on
your swarm nodes, you should plan for a common hostname strategy.
Decide if you want to use short hostnames, like `engine01`, or Fully Qualified

6
datacenter/ucp/2.2/guides/admin/install/system-requirements.md
View File

@ -1,7 +1,7 @@
---
title: UCP System requirements
description: Learn about the system requirements for installing Docker Universal Control Plane.
keywords: UCP, architecture, requirements, Docker EE
keywords: UCP, architecture, requirements, Docker Enterprise
---
Docker Universal Control Plane can be installed on-premises or on the cloud.
@ -31,7 +31,7 @@ Windows container images are typically larger than Linux ones and for that reaso
When planning for host storage, workflows based around `docker pull` through UCP will result in higher storage requirements on manager nodes, since `docker pull` through UCP results in the image being pulled on all nodes.
Also, make sure the nodes are running an [operating system support by Docker EE](https://success.docker.com/Policies/Compatibility_Matrix).
Also, make sure the nodes are running an [operating system support by Docker Enterprise](https://success.docker.com/Policies/Compatibility_Matrix).
For highly-available installations, you also need a way to transfer files
between hosts.
@ -90,7 +90,7 @@ unexpected behavior may cause poor performance or even failures.
## Compatibility and maintenance lifecycle
Docker EE is a software subscription that includes three products:
Docker Enterprise is a software subscription that includes three products:
* Docker Engine with enterprise-grade support,
* Docker Trusted Registry,

2
datacenter/ucp/2.2/guides/admin/install/uninstall.md
View File

@ -1,7 +1,7 @@
---
title: Uninstall UCP
description: Learn how to uninstall a Docker Universal Control Plane swarm.
keywords: UCP, uninstall, install, Docker EE
keywords: UCP, uninstall, install, Docker Enterprise
---
Docker UCP is designed to scale as your applications grow in size and usage.

2
datacenter/ucp/2.2/guides/admin/install/upgrade.md
View File

@ -54,7 +54,7 @@ Starting with the manager nodes, and then worker nodes:
> Swarm mode
>
> UCP 2.0 and higher requires swarm mode. Upgrading from a UCP 1.x version
> enables swarm mode in Docker EE Engine.
> enables swarm mode in Docker Engine - Enterprise.
## Upgrade UCP

2
datacenter/ucp/2.2/guides/user/secrets/index.md
View File

@ -1,6 +1,6 @@
---
title: Manage secrets
description: Learn how to manage your passwords, certificates, and other secrets in a secure way with Docker EE
description: Learn how to manage your passwords, certificates, and other secrets in a secure way with Docker Enterprise
keywords: UCP, secret, password, certificate, private key
---

2
datacenter/ucp/3.0/guides/access-control/index.md
View File

@ -50,7 +50,7 @@ roles by navigating to the **Roles** page.
## Resource collections
Docker EE enables controlling access to swarm resources by using
Docker Enterprise enables controlling access to swarm resources by using
*collections*. A collection is a grouping of swarm cluster resources that you
access by specifying a directory-like path.

4
develop/dev-best-practices.md
View File

@ -114,7 +114,7 @@ updates.
another CI/CD pipeline to automatically build and tag a Docker image and test
it.
- Take this even further with [Docker EE](/ee/index.md) by requiring
- Take this even further with [Docker Engine - Enterprise](/ee/index.md) by requiring
your development, testing, and security teams to sign images before they can
be deployed into production. This way, you can be sure that before an image is
deployed into production, it has been tested and signed off by, for instance,
@ -125,5 +125,5 @@ updates.
| Development | Production |
|:--------------------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| Use bind mounts to give your container access to your source code. | Use volumes to store container data. |
| Use Docker Desktop for Mac or Docker Desktop for Windows. | Use Docker EE if possible, with [userns mapping](/engine/security/userns-remap.md) for greater isolation of Docker processes from host processes. |
| Use Docker Desktop for Mac or Docker Desktop for Windows. | Use Docker Engine - Enterprise if possible, with [userns mapping](/engine/security/userns-remap.md) for greater isolation of Docker processes from host processes. |
| Don't worry about time drift. | Always run an NTP client on the Docker host and within each container process and sync them all to the same NTP server. If you use swarm services, also ensure that each Docker node syncs its clocks to the same time source as the containers. |

4
develop/sdk/index.md
View File

@ -128,9 +128,9 @@ You can specify the API version to use, in one of the following ways:
or the
[Python SDK documentation for `client`](https://docker-py.readthedocs.io/en/stable/client.html).
### Docker EE and CE API mismatch
### Docker Engine - Enterprise and Docker Engine - Community API mismatch
If you use Docker EE in production, we recommend using Docker EE in development
If you use Docker Engine - Enterprise in production, we recommend using Docker Engine - Enterprise in development
too. If you can't, such as when your developers use Docker Desktop for Mac or Docker Desktop for
Windows and manually build and push images, then your developers need to configure
their Docker clients to use the same version of the API reported by their Docker

2
docker-for-aws/index.md
View File

@ -106,7 +106,7 @@ The number of workers you want in your swarm (0-1000).
##### ManagerSize
The number of managers in your swarm. On Docker CE, you can select either 1,
The number of managers in your swarm. On Docker Engine - Community, you can select either 1,
3 or 5 managers. We only recommend 1 manager for testing and dev setups. There
are no failover guarantees with 1 manager — if the single manager fails the
swarm goes down as well. Additionally, upgrading single-manager swarms is not

2
docker-for-mac/edge-release-notes.md
View File

@ -11,7 +11,7 @@ For system requirements, see
[What to know before you install](install.md#what-to-know-before-you-install).
Release notes for _edge_ releases are listed below, [_stable_ release
notes](release-notes) are also available. (Following the CE release model,
notes](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 Mac](install.md#download-docker-for-mac).

2
docker-for-mac/release-notes.md
View File

@ -13,7 +13,7 @@ For 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 CE release model,
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).

2
docker-for-windows/edge-release-notes.md
View File

@ -11,7 +11,7 @@ For system requirements, see
[What to know before you install](install.md#what-to-know-before-you-install).
Release notes for _edge_ releases are listed below, [_stable_ release
notes](release-notes) are also available. (Following the CE release model,
notes](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).

2
docker-for-windows/release-notes.md
View File

@ -13,7 +13,7 @@ For 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 CE release model,
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).

6
docker-hub/publish/certify-images.md
View File

@ -46,15 +46,15 @@ The `inspectDockerImage` tool will detect issues and output them as **warnings**
If you are publishing and certifying multiple versions for a Docker image, you will need to run the `inspectDockerImage` tool on each Docker image and send each result to Docker Hub.
If you are publishing and certifying a multi-architecture Docker image (for example, Linux, Power, s390x, Windows) you will need to run the `inspectDockerImage` tool on the Docker EE server running on each architecture and send the results to Docker Hub.
If you are publishing and certifying a multi-architecture Docker image (for example, Linux, Power, s390x, Windows) you will need to run the `inspectDockerImage` tool on the Docker Engine - Enterprise server running on each architecture and send the results to Docker Hub.
Details on how to run the `inspectDockerImage` tool and send the results to Docker Hub are in the sections that follow.
### Prerequisites
Your Docker EE installation must be running on the server used to verify your submissions. If necessary, request entitlement to a specific [Docker Enterprise Edition](https://hub.docker.com/editions/enterprise/docker-ee-trial).
Your Docker Engine - Enterprise installation must be running on the server used to verify your submissions. If necessary, request entitlement to a specific [Docker Enterprise Edition](https://hub.docker.com/editions/enterprise/docker-ee-trial).
- Docker EE (on the server for verifying submissions)
- Docker Engine - Enterprise (on the server for verifying submissions)
- inspectDockerImage tool
### Set up testing environment

4
docker-hub/publish/certify-plugins-logging.md
View File

@ -55,9 +55,9 @@ Best practices require Docker logging plugins to support the [ReadLogs API](/eng
### Prerequisites
Your Docker EE installation must be running on the server used to verify your submissions. If necessary, request entitlement to a specific [Docker Enterprise Edition](https://hub.docker.com/editions/enterprise/docker-ee-trial).
Your Docker Engine - Enterprise installation must be running on the server used to verify your submissions. If necessary, request entitlement to a specific [Docker Enterprise Edition](https://hub.docker.com/editions/enterprise/docker-ee-trial).
- Docker EE (on the server for verifying submissions)
- Docker Engine - Enterprise (on the server for verifying submissions)
- git client
- inspectDockerLoggingPlugin tool

93
docker-hub/publish/customer_faq.md
View File

@ -8,18 +8,23 @@ redirect_from:
## Customer FAQs
## Certification program
## Hub publisher profile
### What is the certification program for images and plugins, and what are some benefits?
### What is the difference between a Community User and a Verified Publisher?
The Docker Certification program for Infrastructure, Images, and Plugins is
designed for both technology partners and enterprise customers to recognize
high-quality Containers and Plugins, provide collaborative support, and ensure
compatibility with Docker EE. Docker Certification is aligned to the available
Docker EE infrastructure and gives enterprises a trusted way to run more
technology in containers with support from both Docker and the publisher.
Community Users have simply signed up to receive a DockerID and made some of their repositories Public on Docker Hub. By contrast, Verified Publishers have engaged directly with Docker's partner team, and enrolled in our Docker Technology Partner program. These profiles indicate that the business entity of the publisher has been validated, and have taken proactive steps to partner with Docker. Unlike Community content, these Verified Publisher profiles indicate true provenance of the content.
## End user experience
## Certified content
### What are Certified Containers and Plugins, and how are they differentiated from other content on Docker Hub?
The Docker Certification program is
designed for enterprise customers to recognize
high-quality content which is compatible, tested, and supported on Docker Enterprise by a Verified publisher. Docker Certification is aligned to the available
Docker Enterprise products, and gives enterprises a trusted way to run more
technology in containers with the confidence knowing there is a collaborative support relationship in place between Docker and the Verified Publisher.
## End-user experience
### Why do I see the pull command for a few products and no pull command in other products?
@ -27,77 +32,17 @@ If a publisher publishes multiple images as part of their plan - we do not
display the pull command. The pull command visual is exclusively for submissions
that have a single image.
As a future feature we would like to start bringing in the concept of
compositions because it is more connected to real world usage of containers. Our
intent is to start surfacing a better UX by Q1 '18.
### Where can I see all of my subscribed content?
### Where can I see all of my purchases?
To view your purchases, go to the account menu at the upper right corner, and
To view your accessible content, go to the account menu at the upper right corner, and
click **My Content**. The page that appears lists all of your active
subscriptions, and any lapsed or canceled subscriptions.
### Can I buy subscriptions for my organization?
### Can I subscribe to content for my organization?
Yes! Members of an Organization's "Owners" team can buy images and subscriptions
for use in their Organization. Once purchased, images are available for any
Yes! Members of an Organization's "Owners" team can subcsribe to content
for use in their Organization. Once the subscription has been completed, images are available for any
organization member to pull.
Organization owners can view the organization's subscriptions by changing the
selected account on the **My Content** page.
### How can I become a Docker Hub publisher?
You can apply to become a Docker Hub publisher by filling out
the form [here](https://hub.docker.com/publisher/signup). When you've been
accepted to the program, you can set up a publisher profile and submit your
images for review. Learn more about the publisher duties and requirements
[here](https://success.docker.com/Store).
## Docker Hub billing frequently asked questions
### What forms of payment do you accept?
The Docker Hub accepts Visa, MasterCard, American Express, and Discover credit
cards. We do not accept ACH, EFT, or PIN-based debit card transactions at this
time.
### What currencies do you accept?
Docker is a US-based company, and bills in US Dollars (USD). This keeps our
pricing stable and consistent, rather than fluctuating with exchange rates.
### When do you charge my credit card?
We automatically charge your credit card on the first day of your billing cycle
each month, and the charge comes from Docker, Inc. Your billing cycle is a
30 day period starting on the day you subscribe.
### What do I do if my payment fails?
If your payment failed because the card expired or was canceled, you need to
update your credit card information or add an additional card.
Click the user icon menu in the upper right corner, and click
**Billing**. Click the **Payment methods** tab to update your credit card and
contact information.
If you are updating the card details for an organization, be sure to select the
organization name from the **Account** menu before updating the information.
### How does cancellation work? Do you offer refunds?
You can cancel a subscription at any time, however you are still billed
for the full month, and have access to the subscription content until the end of
that billing period.
We do not offer refunds. If you believe that you've been billed in error,
contact our [Billing Support team](mailto:billing@docker.com).
### How do I download the licenses my organization has purchased?
You can view and download your all active licenses for an organization from the
Subscriptions page.
Click the user icon menu at the top right, choose **My Content** and then
select the organization from the **Accounts** drop down menu.

12
docker-hub/publish/index.md
View File

@ -38,14 +38,6 @@ experience the following benefits:
Docker Hub welcomes free and open-source content, as well as software sold
directly by publishers. We support the following commercial models:
### Paid through Docker
This commercial model allows customers to pay for ISV content through Docker, as
described in the Store Vendor Partner agreement. Paid-through-Docker content
includes both software that can be deployed on a host, as well as software that
runs in the cloud and can be accessed by the customer through an agent
(containerized cloud services, for example).
### Licensed content through Docker Hub BYOL program
ISVs can use Docker Hub as an entitlement and distribution platform. Using
@ -61,9 +53,9 @@ information, see [Bring Your Own License (BYOL) products on Store](byol.md).
### Plugins and agents
ISVs have the ability to create and distribute [plugin images](https://hub.docker.com/search?certification_status=certified&q=&type=plugin) for their customers to integrate with the ISV's proprietary hardware or cloud infrastructure and Docker Enterprise Edition deployments.
ISVs have the ability to create and distribute [plugin images](https://hub.docker.com/search?certification_status=certified&q=&type=plugin) for their customers to integrate with the ISV's proprietary hardware or cloud infrastructure and Docker Enterprise deployments.
You can [apply to be a publisher](https://goto.docker.com/partners) and learn more about our [Technology Partner Program](https://www.docker.com/partners/partner-program#/technology_partner).
You can [apply to be a publisher](https://goto.docker.com/2019-Partner-Program-Technology.html) and learn more about our [Technology Partner Program](https://www.docker.com/partners/partner-program#/technology_partner).
## What's next?

115
docker-hub/publish/publish.md
View File

@ -8,32 +8,28 @@ redirect_from:
## Permitted content and support options
* Content that runs on a Docker Enterprise Edition (Docker Certified
Infrastructure) may be published in the Store. This content may also qualify
to become a Docker Certified Container or Plugin image and be backed by
collaborative Docker/Publisher support
* Content that runs on Docker Enterprise may be published on Docker Hub under a Verified Publisher profile. This content may also qualify
to become a Docker Certified Container or Plugin image, and thus backed by
collaborative Docker/Publisher support.
* Content that runs on the Docker Community Edition may be published in the
Store, but is not supported by Docker nor is it eligible for certification.
* Content that runs on the Docker Community may be published in Docker Hub, but is not supported by Docker nor is it eligible to become Certified.
* Content that requires a non Certified Infrastructure environment may not be
published in the Store.
published.
| If your content: | Can publish on Store | Can be certified and supported by Docker | Supported by publisher |
| If your content: | Can publish | Can be Certified | Supported by publisher |
|:-----|:--------|:------|:-----|
| Works on Docker Enterprise Edition | YES | YES | Required |
| Works on Docker Community Edition | YES | NO | Optional |
| Works on Docker Enterprise | YES | YES | Required |
| Works on Docker Community | YES | NO | Optional |
| Does not work on Docker Certified Infrastructure | NO | N/A | N/A |
## Onboarding
The Docker Hub publishing process begins from the landing page: sign in with
your Docker ID and specify a product name and image source from a private
repository. Your product images must be stored in private repositories of Docker
Cloud and/or Hub as they serve as an internal staging area from which you can
revise and submit content for review.
your Docker ID and specify a product name and image source from a private or public
repository.
After specifying a source, provide the content-manifest items to populate your
product details page. These items include logos, descriptions, and licensing and
@ -127,7 +123,7 @@ of your product, keep your images up-to-date:
`apt-get install ...` pull the latest versions of dependencies, which may
include security fixes.
## Create and maintain your publisher profile in the Store
## Create and maintain your Verified Publisher profile
Let the Docker community know who you are. Add your details, your company
story, and what you do. At the very minimum, we require:
@ -136,12 +132,12 @@ story, and what you do. At the very minimum, we require:
* Company website
* Phone number
* Valid company email
* Company icon/logo (square; at least 512x512px
* Company icon/logo (square; at least 512x512px)
## Prepare your image-manifest materials
You must provide the namespace (including repository and tags) of a private
You must provide the namespace (including repository and tags) of a private or public
repository on Docker Hub that contains the source for your product.
This repository path is not shown to users, but the repositories you choose
determine the Product Tiers available for customers to download.
@ -160,18 +156,17 @@ discoverable:
9. Product tier description
10. Product tier price
11. Installation instructions
12. Link to license agreements
12. Link to, or text of, license agreements
### How the manifest information is displayed in the UI
This is an approximate representation. We frequently make enhancements to the
look and some elements might shift around.
This is an approximate representation, and some elements might shift around as we make enhancements.
![manifest information displayed on store UI](images/subscribed.png)
## Support your users
Docker users who download your content from the Store might need your help
Docker users who download your content might need help
later, so be prepared for questions! The information you provide with your
submission saves support time in the future.
@ -183,14 +178,13 @@ there self-help or troubleshooting resources available?
### Support SLA
Include a Service Level Agreement (SLA) for each image you're offering for the
Store. An SLA is your commitment to your users about the nature and level of
Include a Service Level Agreement (SLA) for each image you're offering. An SLA is your commitment to your users about the nature and level of
support you provide to them. Make sure your SLA includes support hours and
response-time expectations, where applicable.
## Security and audit policies
Docker Hub [scans](#docker-security-scanning) your official images for
Docker Hub [scans](#docker-security-scanning) your content for
vulnerabilities with the Docker Security Scanning tool, and
[audits](#usage-audit-and-reporting) consumer activity of your images to provide
you intelligence about the use of your product.
@ -285,15 +279,6 @@ To interpret the results of a scanned image:
National Vulnerability Database (NVD) provides CVSS scores for
almost all known vulnerabilities.
* Docker classifies the severity of issues per CVSS range, Docker classification,
and service level agreement (SLA) as follows.
| CVSS range | Docker classification | SLA for fixing issues |
|:-----|:--------|:------|
| 7.0 to 10.0 | Critical | Within 72 hours of notification |
| 4.0 to 6.9 | Major | Within 7 days of notification |
| 0.1 to 3.9 | Minor | No SLA. Best-effort to fix or address in documentation. |
* In addition to CVSS, the Docker Security team can identify or classify
vulnerabilities that need to be fixed, and categorize them in the
minor-to-critical range.
@ -304,14 +289,6 @@ To interpret the results of a scanned image:
* If you use Docker’s Scanning Service, you can subscribe to a notification
service for new vulnerabilities.
* Failure to meet above SLAs may cause the listing to be put on “hold”.
* A warning label shows up on the marketplace listing. An email is sent to the
users who have downloaded and subscribed for notifications.
* A Repo’s listing can stay in the "hold" state for a maximum of 1 month, after
which the listing is revoked.
### Usage audit and reporting
Unless otherwise negotiated, an audit of activity on publisher content is
@ -330,7 +307,7 @@ There are three types of certification that appear in Docker Hub.
![certified container badge](images/certified_container.png)
Certifies that a container image on Docker Hub has been tested; complies best
practices guidelines; runs on a Docker Certified Infrastructure; has proven
practices guidelines; runs on Docker Certified Infrastructure; has proven
provenance; been scanned for vulnerabilities; and is supported by Docker and the
content publisher
@ -341,12 +318,6 @@ access system level Docker APIs. Docker Certified Plugins provide the same level
of assurance as a Docker Certified Container, but go further by having passed an
additional suite of API compliance testing.
![certified plugins badge](images/certified_infrastructure.png)
Indicates that the release of the Docker Edition and the underlying platform
have been tested together and are supported in combination by both Docker and
the partner.
### Docker Certified Publisher FAQ
#### What is the Docker Certified program?
@ -354,16 +325,12 @@ the partner.
Docker Certified Container images and plugins are meant to differentiate high
quality content on Docker Hub. Customers can consume Certified Containers with
confidence knowing that both Docker and the publisher stands behind the
solution. Further details can be found in the
[Docker Partner Program Guide](https://www.docker.com/partnerprogramguide){: target="_blank" class="_"}.
solution. Further details and an application can be [found here.](https://goto.docker.com/2019-Partner-Program-Technology.html){: target="_blank" class="_"}.
#### What are the benefits of Docker Certified?
Docker Hub promotes Docker Certified Containers and Plugins running on Docker
Certified Infrastructure trusted and high quality content. With over 8B image
pulls and access to Docker’s large customer base, a publisher can differentiate
their content by certifying their images and plugins. With a revenue share
agreement, Docker can be a channel for your content. The Docker Certified badge
Certified Infrastructure trusted and high quality content. The Docker Certified badge
can also be listed alongside external references to your product.
#### How is the Docker Certified Container image listed on Docker Hub?
@ -376,7 +343,7 @@ search parameters to show only certified content.
#### Is certification optional or required?
Certification is recommended for most commercial and supported container images.
Certification is recommended for all commercial and supported container images.
Free, community, and other commercial (non-certified) content may also be listed
on Docker Hub.
@ -384,10 +351,9 @@ on Docker Hub.
#### How is support handled?
All Docker Certified Container images and plugins running on Docker Certified
Infrastructure come with SLA based support provided by the publisher and Docker.
All Docker Certified Container images and plugins running on Docker Enterprise come with support provided directly by the publisher, under your existing SLA.
Normally, a customer contacts the publisher for container and application level
issues. Likewise, a customer contacts Docker for Docker Edition support. In the
issues. Likewise, a customer contacts Docker for Docker Enterprise support. In the
case where a customer calls Docker (or vice versa) about an issue on the
application, Docker advises the customer about the publisher support process and
performs a handover directly to the publisher if required. TSAnet is required
@ -396,42 +362,15 @@ for exchange of support tickets between the publisher and Docker.
#### How does a publisher apply to the Docker Certified program?
Start by applying to be a [Docker Technology
Partner](https://goto.docker.com/partners){: target="_blank" class="_"}
* Requires acceptance of partnership agreement for completion
* Identify commercial content that can be listed on Store and includes a support
offering
* Test your image against the Docker CS Engine 1.12+ or on a Docker Certified
Infrastructure version 17.03 and above (Plugins must run on 17.03 and above)
* Submit your image for Certification through the publisher portal. Docker
scans the image and works with you to address vulnerabilities. Docker also
conducts a best practices review of the image.
* Be a [TSAnet](https://www.tsanet.org/){: target="_blank" class="_"} member or
join the Docker Limited Group.
* Upon completion of Certification criteria, and acceptance by
Docker, the Publisher’s product page is updated to reflect Certified status.
#### Is there a fee to join the program?
In the future, Docker may charge a small annual listing fee. This is waived for
the initial period.
Partner](https://goto.docker.com/2019-Partner-Program-Technology.html){: target="_blank" class="_"}
#### What is the difference between Official Images and Docker Certified?
Many Official images transition to the Docker Certified program and are
maintained and updated by the original owner of the software. Docker
continues to maintain some of the base OS images and language frameworks.
Official Images is a program sponsored by Docker for the curation and packaging of Open Source Software. While upstream vendors are sometimes involved, this is not always the case. Docker Certified content is explicitly provided, maintained, and supported directly by the ISV.
#### How is certification of plugins handled?
Docker Certification program recognizes the need to apply special scrutiny and
testing to containers that access system level interfaces like storage volumes
and networking. Docker identifies these special containers as “Plugins” which
require additional testing by the publisher or Docker. These plugins employ the
V2 Plugin Architecture that was first made available in 1.12 (experimental) and
now available in Docker Enterprise Edition 17.03
require additional testing by the publisher or Docker.

85
docker-hub/publish/publisher_faq.md
View File

@ -9,38 +9,21 @@ redirect_from:
## Certification program
### What is the certification program for images and plugins, and what are some benefits?
### What is the certification program for containers and plugins, and what are some benefits?
The Docker Certification program for Infrastructure, Images, and Plugins is
The Docker Certification program for Containers and Plugins is
designed for both technology partners and enterprise customers to recognize
high-quality Containers and Plugins, provide collaborative support, and ensure
compatibility with Docker EE. Docker Certification is aligned to the available
Docker EE infrastructure and gives enterprises a trusted way to run more
compatibility with the Docker Enterprise platform. Docker Certified products give enterprises a trusted way to run more
technology in containers with support from both Docker and the publisher. The
[Docker Technology Partner guide](https://www.docker.com/partners/partner-program#/technology_partner)
explains the Technology Partner program and the Docker Certification Program for
Infrastructure, Images, and Plugins in more detail.
[Docker Technology Partner guide](https://www.docker.com/sites/default/files/d8/2018-12/Docker-Technology-Partner-Program-Guide-120418.pdf)
explains the Technology Partner program, inclusive of process and requirements to Certify Containers and Plugins.
## Publisher signup and approval
### How do I get started with the publisher signup and approval process?
Start by applying to be a Docker Technology Partner at https://goto.docker.com/partner and click on "Publisher".
* Requires acceptance of partnership agreement for completion
* Identify content that can be listed on Hub and includes a support offering
* Test your image against Docker Certified Infrastructure version 17.03 and
above (Plugins must run on 17.03 and above).
* Submit your image for Certification through the publisher portal. Docker
scans the image and work with you to address vulnerabilities. Docker also
conducts a best practices review of the image.
* Be a TSAnet member or join the Docker Limited Group.
* Upon completion of Certification criteria, and acceptance by Docker,
Publisher’s product page is updated to reflect Certified status.
### What is the Docker Hub Publisher Program application timeline?
1-2 weeks.
Start by completing our [Technology Partner application](https://goto.docker.com/2019-Partner-Program-Technology.html). Docker's partner team will review your application, and follow up directly with further steps. If you have any questions or concerns, please reach out directly to us at partners@docker.com!
### Can we have a group of people work on the same product and publish to Docker Hub? (This replicates our internal workflow where more than one person is working on Dockerizing our product.)
@ -52,14 +35,15 @@ Yes. You can submit your content as a team.
The customer will be given the permissions to docker pull any tag associated with the source repo specified. We recommend that you create a distinct repo per plan and only use tags for different versions of that specific plan. For example, if you have a community, pro, and enterprise plan of a single product, you should create three separate repos, `namespace/community, namespace/pro, and namespace/enterprise`. Once a customer is entitled to your enterprise plan, they will be able to pull `store/namespace/enterprise:anytag`.
### How long does it typically take to have an image approved?
2 Weeks.
### What is the typical publishing time for new products and updates?
Products are typically published within 24hrs of submission.
### Once a product is published, what is the process for pushing a new build (1.2, 1.3)? Will we simply edit the same product, adding the newly tagged repos?
Edit the same product and update with the newly tagged repos.
Additionally, for product updates, you may include a set of *Release Notes*. These notes will not be published with the product listing itself. Instead, they will be emailed directly to the current subscriber of the product. This ensures that consumers will have timely, valuable alerts about the availability of new images and significant changes.
### On the Information page, organization details are required. Do we need to fill those in again for every product we publish, or are they carried over? And if we change them for a later image publish, are they updated for all images published by our organization?
Organization details need to be filled in only once. Updating organization info
@ -71,7 +55,7 @@ We don't support the abiltiy to view available tags for published products becau
Official images and community images have available tags visible because anyone can access any tag at any time anonymously.
We aim to have product listings published with the concept of versions, allowing publishers to manage which versions of their products they expose to customers for access. (Expected Q3 2018)
In the future, we may enable product listings published with the concept of versions, allowing publishers to manage which versions of their products they expose to customers for access.
### On the page for another vendor’s product on Docker Hub, I see the following chunks of data: How do these fields map to the following that are required in the publish process?
@ -99,7 +83,7 @@ We aim to have product listings published with the concept of versions, allowing
*Tier Description* is what you see once users get entitled to a plan. For instance, in https://hub.docker.com/images/openmaptiles-openstreetmap-maps/plans/f1fc533a-76f0-493a-80a1-4e0a2b38a563?tab=instructions `A detailed street map of any place on a planet. Evaluation and non-production use. Production use license available separately` is what this publisher entered in the Tier description
*Installation instructions* is documentation on installing your software. In this case the documentation is just `Just launch the container and the map is going to be available on port 80 - ready-to-use - with instructions and list of available styles.` (We recommend more details for any content that's a certification candidate).
### How can I remove a submission? I don’t want to currently have this image published as it is missing several information.
### How can I remove a published product?
If you would like your submission removed, let us know by contacting us at
publisher-support@docker.com.
@ -133,9 +117,9 @@ For instance, if you have a `Developer` Plan, that is mapped to repositories sto
### What options are presented to users to pull an image?
We provide users the following options to access your software
* logged-in users.
* users who have accepted ToS
* all users (including users without Docker Identity)
* Logged-in users
* Subscribed users only (requires ToS acceptance)
* All users (including users without Docker Identity)
Here is a [screenshot](https://user-images.githubusercontent.com/2453622/32067299-00cf1210-ba83-11e7-89f8-15deed6fef62.png) to describe how publishers can update the options provided to customers.
### If something is published as a free tier, for subscribed users only, does a user need to explicitly click Accept on the license terms for which we provide the link before they can download the image?
@ -158,21 +142,8 @@ from Docker Hub. The container may continue running. If you have a licensing
scheme built into the container, the licensing scheme can be a forcing function
and stop the container. (_We do not build anything into the container, it is up to the publisher_).
### How does a customer transition from a Trial to a Paid subscription? Question assumes these are two separate pulls from Docker Hub, or can they just drop in a license through Docker Hub?
Publisher can provide two different tokens or let customers use the same token
and internally map the customer to a paid plan vs a free trial.
### What are Docker Hub pricing plans like? Can I have metered pricing?
As a publisher you can charge a subscription fee every month in USD. The amount
is determined by you. We are working on other pricing options. If you have
feedback about pricing, send us an email at publisher-support@docker.com
### As a publisher, I have not setup any payment account. How does money get to me if my commercial content gets purchased by customers?
We (Docker) cut you a check post a revenue share. Your Docker Hub Vendor
Agreement should cover specifics.
### Does Docker Hub offer a Subscription service, handle our invoicing, payments, etc? What happened to Pay-via-Docker?
Docker has deprecated the Pay-via-Docker subscription service. At this time, Docker Hub only supports distribution of content, under the BYOL Ungated model. In the future, we intend to release BYOL Gated functionality as well. If neither of these options will work for your product and licensing structure, please do inform your partner manager to help guide our feature prioritization.
### How does Docker handle Export control? Can individual countries be specified if differing from Docker's list of embargoed countries?
@ -185,16 +156,15 @@ specific groups. Send us an email at publisher-support if you have questions
### Where can I view customer insights?
Analytics reports are only available to Publishers with Certified or Commercial
Content. Go to https://hub.docker.com/publisher/center and click on "Actions"
Analytics reports are only available to Publishers with Certified. Go to https://hub.docker.com/publisher/center and click on "Actions"
for the product you'd like to view analytics for. Here is a
[screenshot](https://user-images.githubusercontent.com/2453622/32352202-6e87ce6e-bfdd-11e7-8fb0-08fe5a3e8930.png).
### How do metrics differentiate between Free and Paid subscribers?
### How do metrics differentiate between the different Pull Requirement options?
The Analytics reports contain information about the Subscriber and the
relevant product plan. You can identify subscribers for each plan
for each product.
for each product. Only anonymous information is available to our publishers. If you'd like the opportunity to receive Lead information, Subscribed Users Only will need to be selected as the pull requirement. Please review the Technology Partner Program guide, and consult with your partner manager, for more information on Lead Generation plans.
### Can I preview my submission before publishing?
@ -212,4 +182,17 @@ Yes
### Can I have a publish by date for my content?
Not yet. Potential ETA Q2 2018.
Not yet. This is a planned enhancement, but we have no specific availability date at this time.
In lieu of an automated approach, you may coordinate publication timeline directly with your partner manager.
### Can I convert my Hub Community profile to a Verified Publisher profile?
No, at this time you will need to separately sign up to become a Verified Publisher. Following that, you may migrate or re-publish your public repo's under the new Verified Publisher profile.
### Once I've completed the process to become a Verified Publisher with my partner manager, how do I get access to the Publisher Portal?
You will need to apply for access. Please either follow [this direct link](https://hub.docker.com/publisher/center) or click the "Publisher Center" link at the bottom of any Docker Hub page. Please note, that you will need to be logged in with a DockerID in order to see this link.
### What kind of DockerID should I use to publish my content?
Publishing should be done with an [Organization level DockerID](https://docs.docker.com/docker-hub/orgs/). We recommend that this account utilize a shared alias with your corporate email account and only individual DockerIDs with company email are added to that organization.

55
docker-hub/upgrade.md
View File

@ -1,12 +1,12 @@
---
description: Upgrading your Docker Hub Plan
keywords: Docker, docker, trusted, registry, accounts, plans, Dockerfile, Docker Hub, webhooks, docs, documentation
title: Upgrade your Plan
title: Upgrade your plan
---
User and organization accounts maintain separate Docker Hub billing profiles.
### Upgrade your personal plan
## Upgrade your personal plan
Docker Hub includes one private Docker Hub repository for free. If you need
more private repositories, you can upgrade from your free account to a paid
@ -17,7 +17,7 @@ To upgrade:
2. Click Change Plan
3. Select your plan and provide your payment information to upgrade ![Upgrade Plan](images/index-upgrade-plan.png)
### Upgrade your organization's plan
## Upgrade your organization's plan
To upgrade an Organization's plan:
@ -25,3 +25,52 @@ To upgrade an Organization's plan:
2. Change the selected account to your Organization whose plan you'd like to upgrade ![Change Account](images/upgrade-change-account.png)
3. Click Change Plan ![Change Plan](images/upgrade-change-plan.png)
## Docker Hub repo plan billing FAQ
### What forms of payment do you accept?
The Docker Hub accepts Visa, MasterCard, American Express, and Discover credit
cards. We do not accept ACH, EFT, or PIN-based debit card transactions at this
time.
### What currencies do you accept?
Docker is a US-based company, and bills in US Dollars (USD). This keeps our
pricing stable and consistent, rather than fluctuating with exchange rates.
### When do you charge my credit card?
We automatically charge your credit card on the first day of your billing cycle
each month, and the charge comes from Docker, Inc. Your billing cycle is a
30-day period starting on the day you subscribe.
### What do I do if my payment fails?
If your payment failed because the card expired or was canceled, you need to
update your credit card information or add an additional card.
Click the user icon menu in the upper right corner, and click
**Billing**. Click the **Payment methods** tab to update your credit card and
contact information.
If you are updating the card details for an organization, be sure to select the
organization name from the **Account** menu before updating the information.
### How does cancellation work? Do you offer refunds?
You can cancel a subscription at any time, however you are still billed
for the full month, and have access to the subscription content until the end of
that billing period.
We do not offer refunds. If you believe that you've been billed in error,
contact our [Billing Support team](mailto:billing@docker.com).
### How do I download the licenses my organization has purchased?
You can view and download all you active licenses for an organization from the
**Subscriptions** page.
Click the user icon menu at the top right, choose **My Content** and then
select the organization from the **Accounts** drop down menu.

10
edge/index.md
View File

@ -1,19 +1,19 @@
---
title: Docker CE Edge documentation
title: Docker Engine - Community Edge documentation
description: Information about current Docker Edge releases
keywords: engine, edge, installation
---
> **The Docker CE Edge channel is deprecated in favor of nightly channel. See [About Docker CE](/install/index.md) for details on how to access the nightly channel.**
> **The Docker Engine - Community Edge channel is deprecated in favor of nightly channel. See [About Docker Engine - Community](/install/index.md) for details on how to access the nightly channel.**
The latest Docker CE Stable release is **[{{ site.docker_ce_version }}](/engine/release-notes/)**.
The latest Docker Engine - Community Stable release is **[{{ site.docker_ce_version }}](/engine/release-notes/)**.
Stable releases are not published to the Edge channel, so Linux repository users
should subscribe to the Stable channels.
> Commercial support is not available for Docker CE. For information about all Docker release channels and expectations about support, see [About Docker CE](/install/index.md).
> Commercial support is not available for Docker Engine - Community. For information about all Docker release channels and expectations about support, see [About Docker Engine - Community](/install/index.md).
### Docker CE resources
### Docker Engine - Community resources
- [Docker CLI (docker) reference](/engine/reference/commandline/docker/)
- [Docker Daemon CLI (dockerd) reference](/engine/reference/commandline/dockerd/)

2
ee/admin/backup/back-up-ucp.md
View File

@ -25,7 +25,7 @@ Backup contents are stored in a `.tar` file. Backups contain UCP configuration m
| Data | Description | Backed up |
| :---------------------|:-----------------------------------------------------------------------------------|:----------|
| Configurations | UCP configurations, including Docker EE license. Swarm, and client CAs | yes
| Configurations | UCP configurations, including Docker Engine - Enterprise license. Swarm, and client CAs | yes
| Access control | Permissions for teams to swarm resources, including collections, grants, and roles | yes
| Certificates and keys | Certificates and public and private keys used for authentication and mutual TLS communication | yes
| Metrics data | Monitoring data gathered by UCP | yes

27
ee/dtr/admin/configure/external-storage/storage-backend-migration.md
View File

@ -26,27 +26,26 @@ Docker recommends the following steps for your storage backend and metadata migr
5. With DTR restored from your backup and your storage data migrated to your new backend, garbage collect any dangling blobs using the following API request:
```bash
curl -u <username>:$TOKEN -X POST "https://<dtr-url>/api/v0/jobs" -H "accept: application/json" -H "content-type: application/json" -d "{ \"action": \"onlinegc_blobs\" }"
```
On success, you should get a `202 Accepted` response with a job `id` and other related details.
This ensures any blobs which are not referenced in your previously created backup get destroyed.
```bash
curl -u <username>:$TOKEN -X POST "https://<dtr-url>/api/v0/jobs" -H "accept: application/json" -H "content-type: application/json" -d "{ \"action": \"onlinegc_blobs\" }"
```
On success, you should get a `202 Accepted` response with a job `id` and other related details. This ensures any blobs which are not referenced in your previously created backup get destroyed.
### Alternative option for data migration
- If you have a long maintenance window, you can skip some steps from above and do the following:
If you have a long maintenance window, you can skip some steps from above and do the following:
1. Put DTR in "read-only" mode using the following API request:
1. Put DTR in "read-only" mode using the following API request:
```bash
curl -u <username>:$TOKEN -X POST "https://<dtr-url>/api/v0/meta/settings" -H "accept: application/json" -H "content-type: application/json" -d "{ \"readOnlyRegistry\": true }"
```
On success, you should get a `202 Accepted` response.
```bash
curl -u <username>:$TOKEN -X POST "https://<dtr-url>/api/v0/meta/settings" -H "accept: application/json" -H "content-type: application/json" -d "{ \"readOnlyRegistry\": true }"
```
On success, you should get a `202 Accepted` response.
2. Migrate the contents of your current storage backend to the new one you are switching to. For example, upload your current storage data to your new NFS server.
2. Migrate the contents of your current storage backend to the new one you are switching to. For example, upload your current storage data to your new NFS server.
3. [Reconfigure DTR](/reference/dtr/2.6/cli/reconfigure) while specifying the `--storage-migrated` flag to preserve your existing tags.
3. [Reconfigure DTR](/reference/dtr/2.6/cli/reconfigure) while specifying the `--storage-migrated` flag to preserve your existing tags.
## DTR 2.6.0-2.6.4 and DTR 2.5 (with experimental garbage collection)

2
ee/dtr/user/manage-images/pull-and-push-images.md
View File

@ -87,7 +87,7 @@ however).
* When a user pulls a Windows image from DTR, the Windows base layers are
automatically fetched from Microsoft and the other layers are fetched from DTR.
This default behavior is recommended for standard Docker EE installations, but
This default behavior is recommended for Docker Engine - Enterprise installations, but
for air-gapped or similarly limited setups Docker can optionally optionally also
push the Windows base layers to DTR.

141
ee/dtr/user/manage-images/sign-images/index.md
View File

@ -7,21 +7,21 @@ redirect_from:
- /ee/dtr/user/manage-images/sign-images/manage-trusted-repositories/
---
2 Key components of the Docker Trusted Registry are the Notary Server and Notary
Signer. These 2 containers give us the required components to use Docker Content
Trust right out of the box. [Docker Content
Trust](/engine/security/trust/content_trust/) allows us to sign image tags,
therefore whoever pulls the image can validate that they are getting the image
you create, or a forged one.
Two key components of the Docker Trusted Registry are the Notary Server and the Notary
Signer. These two containers provide the required components for using Docker Content
Trust (DCT) out of the box. [Docker Content
Trust](/engine/security/trust/content_trust/) allows you to sign image tags,
therefore giving consumers a way to verify the integrity of your image.
As part of Docker Trusted Registry both the Notary server and the Registry
server are accessed through a front end Proxy, with both components sharing the
UCP's RBAC Engine. Therefore no additional configuration of the Docker Client
is required to use trust.
As part of DTR, both the Notary and the Registry
servers are accessed through a front-end proxy, with both components sharing the
UCP's RBAC (Role-based Access Control) Engine. Therefore, you do not need additional Docker client
configuration in order to use DCT.
Docker Content Trust is integrated into the Docker CLI, allowing you to
configure repositories, add signers and sign images all through the `$ docker
trust` command.
DCT is integrated with the Docker CLI, and allows you to:
- Configure repositories
- Add signers, and
- Sign images using the `docker trust` command
![image without signature](../../../images/sign-an-image-1.svg)
@ -29,31 +29,29 @@ trust` command.
UCP has a feature which will prevent [untrusted
images](/ee/ucp/admin/configure/run-only-the-images-you-trust/) from being
deployed on the cluster. To use this feature, we first need to upload and sign
images into DTR. To tie the signed images back to UCP, we will actually sign the
images with private keys of UCP users. Inside of a UCP Client bundle the
`key.pem` can be used a User's private key, with the `cert.pem` being a public
key within a x509 certificate.
deployed on the cluster. To use the feature, you need to sign and push images to your DTR.
To tie the signed images back to UCP, you need to sign the
images with the private keys of the UCP users. From a UCP client bundle, use
`key.pem` as your private key, and `cert.pem` as your public key
on an `x509` certificate.
To sign images in a way that UCP trusts them, you need to:
To sign images in a way that UCP can trust, you need to:
1. Download a Client Bundle for a User you want to use to sign the images.
2. Load the private key of the User into your workstations trust store.
1. Download a client bundle for the user account you want to use for signing the images.
2. Add the user's private key to your machine's trust store.
3. Initialize trust metadata for the repository.
4. Delegate signing for that repository to the UCP User.
5. Sign the Image.
4. Delegate signing for that repository to the UCP user.
5. Sign the image.
In this example we're going to pull a nginx image from the Docker Hub, re-tag it
as `dtr.example.com/dev/nginx:1`, push the image to DTR and sign it in a way
that is trusted by UCP. If you manage multiple repositories, you'll have to do
the same procedure for each repository.
The following example shows the `nginx` image getting pulled from Docker Hub, tagged
as `dtr.example.com/dev/nginx:1`, pushed to DTR, and signed in a way
that is trusted by UCP.
### Import a UCP User's Private Key
### Import a UCP user's private key
Once you have download and extracted a UCP User's client bundle into your local
directory, you need to load the Private key into the local Docker trust store
`(~/.docker/trust)`. The name used here is purely metadata to help keep track of
which keys you have imported.
After downloading and extracting a UCP client bundle into your local
directory, you need to load the private key into the local Docker trust store
`(~/.docker/trust)`. To illustrate the process, we will use `jeff` as an example user.
```bash
$ docker trust key load --name jeff key.pem
@ -63,16 +61,16 @@ Repeat passphrase for new jeff key with ID a453196:
Successfully imported key from key.pem
```
### Initialize the trust metadata and add the Public Key
### Initialize the trust metadata and add the user's public certificate
Next, we need to initiate trust metadata for a DTR repository. If you have not
done so already, navigate to the **DTR web UI**, and create a repository for
your image. In this example we've created the `prod/nginx` repository.
Next,initiate trust metadata for a DTR repository. If you have not
already done so, navigate to the **DTR web UI**, and create a repository for
your image. This example uses the `nginx` repository in the `prod` namespace.
As part of initiating the repository, we will add the public key of the UCP User
as a signer. You will be asked for a number of passphrases to protect the keys.
Make a note of these passphrases, and see [Managing Delegations in a Notary Server](/engine/security/trust/trust_delegation/#managing-delegations-in-a-notary-server)
to learn more about managing keys.
As part of initiating the repository, the public key of the UCP user needs to be added
to the Notary server as a signer for the repository. You will be asked for a number of
passphrases to protect the keys.Make a note of these passphrases, and
see [Managing Delegations in a Notary Server](/engine/security/trust/trust_delegation/#managing-delegations-in-a-notary-server) to learn more about managing keys.
```bash
@ -86,7 +84,7 @@ Successfully initialized "dtr.example.com/prod/nginx"
Successfully added signer: jeff to dtr.example.com/prod/nginx
```
We can inspect the trust metadata of the repository to make sure the User has
Inspect the trust metadata of the repository to make sure the user has
been added correctly.
```bash
@ -105,11 +103,10 @@ Administrative keys for dtr.example.com/prod/nginx
Root Key: b74854cb27cc25220ede4b08028967d1c6e297a759a6939dfef1ea72fbdd7b9a
```
### Sign the Image
### Sign the image
Finally, we will sign an image tag. These steps download the Image from the
Docker Hub, retag the Image to the DTR repository, push the image up to DTR, as
well as signing the tag with the UCP User's keys.
Finally, user `jeff` can sign an image tag. The following steps include downloading the image from Hub, tagging the image for Jeff's DTR repository, pushing the image to Jeff's DTR, as
well as signing the tag with Jeff's keys.
```bash
$ docker pull nginx:latest
@ -128,7 +125,7 @@ Enter passphrase for jeff key with ID 927f303:
Successfully signed dtr.example.com/prod/nginx:1
```
We can inspect the trust metadata again to make sure the image tag has been
Inspect the trust metadata again to make sure the image tag has been
signed successfully.
```bash
@ -150,49 +147,48 @@ Administrative keys for dtr.example.com/prod/nginx:1
Root Key: b74854cb27cc25220ede4b08028967d1c6e297a759a6939dfef1ea72fbdd7b9a
```
Or we can have a look at the signed image from within the **DTR UI**.
Alternatively, you can review the signed image from the DTR web UI.
![DTR](../../../images/sign-an-image-3.png){: .with-border}
### Adding Additional Delegations
### Add delegations
If you wanted to sign this image with multiple UCP Users, maybe if you had a use
case where an image needed to be signed by a member of the `Security` team and a
member of the `Developers` team. Then you can add multiple signers to a
repository.
You have the option to sign an image using multiple UCP users' keys. For example, an image
needs to be signed by a member of the `Security` team and a
member of the `Developers` team. Let's assume `jeff` is a member of the Developers team.
In this case, we only need to add a member of the Security team.
To do so, first load a private key from a UCP User of the Security Team's in to
the local Docker Trust Store.
To do so, first add the private key of the Security team member to
the local Docker trust store.
```bash
$ docker trust key load --name security key.pem
$ docker trust key load --name ian key.pem
Loading key from "key.pem"...
Enter passphrase for new security key with ID 5ac7d9a:
Repeat passphrase for new security key with ID 5ac7d9a:
Enter passphrase for new ian key with ID 5ac7d9a:
Repeat passphrase for new ian key with ID 5ac7d9a:
Successfully imported key from key.pem
```
Upload the Public Key to the Notary Server and Sign the Image. You will be asked
for both the Developers passphrase, as well as the Security Users passphrase to
Upload the user's public key to the Notary Server and sign the image. You will be asked
for `jeff`, the developer's passphrase, as well as the `ian` user's passphrase to
sign the tag.
```bash
$ docker trust signer add --key cert.pem security dtr.example.com/prod/nginx
Adding signer "security" to dtr.example.com/prod/nginx...
$ docker trust signer add --key cert.pem ian dtr.example.com/prod/nginx
Adding signer "ian" to dtr.example.com/prod/nginx...
Enter passphrase for repository key with ID e0d15a2:
Successfully added signer: security to dtr.example.com/prod/nginx
Successfully added signer: ian to dtr.example.com/prod/nginx
$ docker trust sign dtr.example.com/prod/nginx:1
Signing and pushing trust metadata for dtr.example.com/prod/nginx:1
Existing signatures for tag 1 digest 5b49c8e2c890fbb0a35f6050ed3c5109c5bb47b9e774264f4f3aa85bb69e2033 from:
jeff
Enter passphrase for jeff key with ID 927f303:
Enter passphrase for security key with ID 5ac7d9a:
Enter passphrase for ian key with ID 5ac7d9a:
Successfully signed dtr.example.com/prod/nginx:1
```
Finally, we can check the tag again to make sure it is now signed by 2
signatures.
Finally, check the tag again to make sure it includes two signers.
```bash
$ docker trust inspect --pretty dtr.example.com/prod/nginx:1
@ -200,13 +196,13 @@ $ docker trust inspect --pretty dtr.example.com/prod/nginx:1
Signatures for dtr.example.com/prod/nginx:1
SIGNED TAG DIGEST SIGNERS
1 5b49c8e2c890fbb0a35f6050ed3c5109c5bb47b9e774264f4f3aa85bb69e2033 jeff, security
1 5b49c8e2c890fbb0a35f6050ed3c5109c5bb47b9e774264f4f3aa85bb69e2033 jeff, ian
List of signers and their keys for dtr.example.com/prod/nginx:1
SIGNER KEYS
jeff 927f30366699
security 5ac7d9af7222
ian 5ac7d9af7222
Administrative keys for dtr.example.com/prod/nginx:1
@ -218,13 +214,12 @@ For more advanced use cases like this, see [Delegations for content trust](/engi
## Delete trust data
If an Administrator wants to delete a DTR repository that contains Trust
metadata, they will be prompted to delete the trust metadata first before the
repository can be removed.
If an administrator wants to delete a DTR repository that contains trust
metadata, they will be prompted to delete the trust metadata first before removing the repository.
To delete trust metadata we need to use the Notary CLI. For information on how
to download and configure the Notary CLI head
[here](/engine/security/trust/trust_delegation/#configuring-the-notary-client)
To delete trust metadata, you need to use the Notary CLI. For information on how
to download and configure the Notary CLI see
[Configuring the Notary client](/engine/security/trust/trust_delegation/#configuring-the-notary-client)
```bash

4
ee/get-support.md
View File

@ -1,10 +1,10 @@
---
title: Get support
description: Your Docker EE subscription gives you access to prioritized support. You can file tickets via email or the support portal.
description: Your Docker Enterprise subscription gives you access to prioritized support. You can file tickets via email or the support portal.
keywords: support, help
---
Your Docker Enterprise Edition subscription gives you access to prioritized
Your Docker Enterprise subscription gives you access to prioritized
support. The service levels depend on your subscription.
Before reaching out to Docker Support, make sure you're listed as an authorized

2
ee/index.md
View File

@ -77,7 +77,7 @@ to schedule Kubernetes or Swarm workloads.
> IBM z Systems
>
> Kubernetes workloads aren't supported on IBM z Systems clusters. On a mixed
> cluster with z Systems, Docker EE won't schedule Kubernetes workloads
> cluster with z Systems, Docker Engine - Enterprise won't schedule Kubernetes workloads
> on z Systems nodes.
{: .important}

8
ee/telemetry.md
View File

@ -1,15 +1,15 @@
---
title: Manage usage data collection
description: Understand and manage usage data collected by Docker EE and sent to Docker.
description: Understand and manage usage data collected by Docker Engine - Enterprise and sent to Docker.
keywords: enterprise, telemetry, data collection
redirect_from:
- /enterprise/telemetry/
---
Docker EE Engine version 17.06 and later includes a telemetry plugin.
The plugin is enabled by default on Ubuntu starting with Docker EE 17.06.0
Docker Engine - Enterprise version 17.06 and later includes a telemetry plugin.
The plugin is enabled by default on Ubuntu starting with Docker Engine - Enterprise 17.06.0
and on the rest of the EE-supported Linux distributions starting with version
17.06.2-ee-5. The telemetry plugin is not part of Docker EE for Windows Server.
17.06.2-ee-5. The telemetry plugin is not part of Docker Engine - Enterprise for Windows Server.
The telemetry plugin sends system information to Docker Inc. Docker uses this
information to improve Docker EE. For details about the telemetry plugin and

8
ee/ucp/admin/backups-and-disaster-recovery.md
View File

@ -17,7 +17,7 @@ UCP maintains data about:
| Data | Description |
|:----------------------|:---------------------------------------------------------------------------------------------------------------------|
| Configurations | The UCP cluster configurations, as shown by `docker config ls`, including Docker EE license and swarm and client CAs |
| Configurations | The UCP cluster configurations, as shown by `docker config ls`, including Docker Enterprise license and swarm and client CAs |
| Access control | Permissions for teams to cluster resources, including resource sets, grants, and roles |
| Certificates and keys | The certificates, public keys, and private keys that are used for authentication and mutual TLS communication |
| Metrics data | Monitoring data gathered by UCP |
@ -32,7 +32,7 @@ This data is persisted on the host running UCP, using named volumes.
your Layer 7 routing deployment, reapply your custom settings.
## Backup steps
Back up your Docker EE components in the following order:
Back up your Docker Engine - Enterprise components in the following order:
1. [Back up your swarm](/engine/swarm/admin_guide/#back-up-the-swarm)
2. Back up UCP
@ -106,7 +106,7 @@ $ gpg --decrypt /tmp/backup.tar | tar --list
### Security-Enhanced Linux (SELinux)
For Docker EE 17.06 or higher, if the Docker engine has SELinux enabled,
For Docker Engine - Enterprise 17.06 or higher, if the Docker engine has SELinux enabled,
which is typical for RHEL hosts, you need to include `--security-opt label=disable`
in the `docker` command:
@ -167,7 +167,7 @@ UCP restore recovers the following assets from the backup file:
* Users, teams, and permissions.
* All UCP configuration options available under `Admin Settings`, like the
Docker EE subscription license, scheduling options, content trust, and
Docker Enterprise subscription license, scheduling options, content trust, and
authentication backends.
UCP restore does not include swarm assets such as cluster membership, services, networks,

2
ee/ucp/admin/configure/collect-cluster-metrics.md
View File

@ -17,7 +17,7 @@ The data is stored locally on disk for each Prometheus server, so data is not re
Events, logs, and metrics are sources of data that provide observability of your cluster. Metrics monitors numerical data values that have a time-series component. There are several sources from which metrics can be derived, each providing different kinds of meaning for a business and its applications.
The Docker EE platform provides a base set of metrics that gets you running and into production without having to rely on external or 3rd party tools. Docker strongly encourages the use of additional monitoring to provide more comprehensive visibility into your specific Docker environment, but recognizes the need for a basic set of metrics built into the product. The following are examples of these metrics:
The Docker Enterprise platform provides a base set of metrics that gets you running and into production without having to rely on external or 3rd party tools. Docker strongly encourages the use of additional monitoring to provide more comprehensive visibility into your specific Docker environment, but recognizes the need for a basic set of metrics built into the product. The following are examples of these metrics:
## Business metrics ##

14
ee/ucp/admin/configure/join-nodes/join-linux-nodes-to-cluster.md
View File

@ -1,17 +1,17 @@
---
title: Join Linux nodes to your cluster
description: Learn how to scale a Docker Enterprise Edition cluster by adding manager and worker nodes.
keywords: Docker EE, UCP, cluster, scale, worker, manager
keywords: Docker Engine - Enterprise, UCP, cluster, scale, worker, manager
---
Docker EE is designed for scaling horizontally as your applications grow in
Docker Engine - Enterprise is designed for scaling horizontally as your applications grow in
size and usage. You can add or remove nodes from the cluster to scale it
to your needs. You can join Windows Server 2016, IBM z System, and Linux nodes
to the cluster.
Because Docker EE leverages the clustering functionality provided by Docker
Because Docker Engine - Enterprise leverages the clustering functionality provided by Docker
Engine, you use the [docker swarm join](/engine/swarm/swarm-tutorial/add-nodes.md)
command to add more nodes to your cluster. When you join a new node, Docker EE
command to add more nodes to your cluster. When you join a new node, Docker Engine - Enterprise
services start running on the node automatically.
## Node roles
@ -23,10 +23,10 @@ When you join a node to a cluster, you specify its role: manager or worker.
manager nodes allows your swarm to be highly available and tolerant of
node failures.
Manager nodes also run all Docker EE components in a replicated way, so
Manager nodes also run all Docker Engine - Enterprise components in a replicated way, so
by adding additional manager nodes, you're also making the cluster highly
available.
[Learn more about the Docker EE architecture.](/enterprise/docker-ee-architecture.md)
[Learn more about the Docker Engine - Enterprise architecture.](/enterprise/docker-ee-architecture.md)
- **Worker**: Worker nodes receive and execute your services and applications.
Having multiple worker nodes allows you to scale the computing capacity of
@ -99,7 +99,7 @@ To promote or demote a manager node:
4. Click **Save** and wait until the operation completes.
5. Navigate to the **Nodes** page, and confirm that the node role has changed.
If you're load-balancing user requests to Docker EE across multiple manager
If you're load-balancing user requests to Docker Engine - Enterprise across multiple manager
nodes, don't forget to remove these nodes from your load-balancing pool when
you demote them to workers.

2
ee/ucp/admin/configure/join-nodes/join-windows-nodes-to-cluster.md
View File

@ -214,4 +214,4 @@ Some features are not yet supported on Windows nodes:
## Known Issues
Refer to the [Docker EE UCP release notes](/ee/ucp/release-notes) for Known Issues information.
Refer to the [Docker Enterprise UCP release notes](/ee/ucp/release-notes) for Known Issues information.

10
ee/ucp/admin/configure/manage-and-deploy-private-images.md
View File

@ -11,7 +11,7 @@ using the Kubernetes orchestrator.
## Open the DTR web UI
1. In the Docker EE web UI, click **Admin Settings**.
1. In the Docker Enterprise web UI, click **Admin Settings**.
2. In the left pane, click **Docker Trusted Registry**.
3. In the **Installed DTRs** section, note the URL of your cluster's DTR
instance.
@ -41,7 +41,7 @@ Docker EE.
- [License your installation](license-your-installation.md).
- [Set up your Docker CLI](../../user-access/cli.md).
When you're set up for CLI-based access to a licensed Docker EE instance,
When you're set up for CLI-based access to a licensed Docker Enterprise instance,
you can push images to DTR.
1. Pull the public WordPress image from Docker Hub:
@ -55,7 +55,7 @@ you can push images to DTR.
```bash
docker tag wordpress:latest <dtr-url>:<port>/admin/wordpress:latest
```
3. Log in to a Docker EE manager node.
3. Log in to a Docker Enterprise manager node.
4. Push the tagged image to DTR:
```bash
@ -78,7 +78,7 @@ You're ready to deploy the `wordpress:latest` image into production.
## Deploy the private image to UCP
With the WordPress image stored in DTR, Docker EE can deploy the image to a
With the WordPress image stored in DTR, Docker Enterprise can deploy the image to a
Kubernetes cluster with a simple Deployment object:
```yaml
@ -122,7 +122,7 @@ The Deployment object's YAML specifies your DTR image in the pod template spec:
a `NodePort` service that exposes the WordPress application, so it's accessible
from outside the cluster.
1. Open the Docker EE web UI, and in the left pane, click **Kubernetes**.
1. Open the Docker Enterprise web UI, and in the left pane, click **Kubernetes**.
2. Click **Create** to open the **Create Kubernetes Object** page.
3. In the **Namespace** dropdown, select **default**.
4. In the **Object YAML** editor, paste the Deployment object's YAML.

20
ee/ucp/admin/configure/set-orchestrator-type.md
View File

@ -1,22 +1,22 @@
---
title: Set the orchestrator type for a node
description: Learn how to specify the orchestrator for nodes in a Docker Enterprise Edition cluster.
keywords: Docker EE, UCP, cluster, orchestrator
keywords: Docker Enterprise, UCP, cluster, orchestrator
---
When you add a node to the cluster, the node's workloads are managed by a
default orchestrator, either Docker Swarm or Kubernetes. When you install
Docker EE, new nodes are managed by Docker Swarm, but you can change the
Docker Enterprise, new nodes are managed by Docker Swarm, but you can change the
default orchestrator to Kubernetes in the administrator settings.
Changing the default orchestrator doesn't affect existing nodes in the cluster.
You can change the orchestrator type for individual nodes in the cluster
by navigating to the node's configuration page in the Docker EE web UI.
by navigating to the node's configuration page in the Docker Enterprise web UI.
## Change the orchestrator for a node
You can change the current orchestrator for any node that's joined to a
Docker EE cluster. The available orchestrator types are **Kubernetes**,
Docker Enterprise cluster. The available orchestrator types are **Kubernetes**,
**Swarm**, and **Mixed**.
The **Mixed** type enables workloads to be scheduled by Kubernetes and Swarm
@ -26,7 +26,7 @@ likelihood of resource contention.
Change a node's orchestrator type on the **Edit node** page:
1. Log in to the Docker EE web UI with an administrator account.
1. Log in to the Docker Enterprise web UI with an administrator account.
2. Navigate to the **Nodes** page, and click the node that you want to assign
to a different orchestrator.
3. In the details pane, click **Configure** and select **Details** to open
@ -43,7 +43,7 @@ When you change the orchestrator type for a node, existing workloads are
evicted, and they're not migrated to the new orchestrator automatically.
If you want the workloads to be scheduled by the new orchestrator, you must
migrate them manually. For example, if you deploy WordPress on a Swarm
node, and you change the node's orchestrator type to Kubernetes, Docker EE
node, and you change the node's orchestrator type to Kubernetes, Docker Enterprise
doesn't migrate the workload, and WordPress continues running on Swarm. In
this case, you must migrate your WordPress deployment to Kubernetes manually.
@ -84,7 +84,7 @@ You can set the default orchestrator for new nodes to **Kubernetes** or
To set the orchestrator for new nodes:
1. Log in to the Docker EE web UI with an administrator account.
1. Log in to the Docker Enterprise web UI with an administrator account.
2. Open the **Admin Settings** page, and in the left pane, click **Scheduler**.
3. Under **Set orchestrator type for new nodes** click **Swarm**
or **Kubernetes**.
@ -177,12 +177,12 @@ the orchestrator:
> Orchestrator label
>
> The `com.docker.ucp.orchestrator` label isn't displayed in the **Labels**
> list for a node in the Docker EE web UI.
> list for a node in the Docker Enterprise web UI.
{: .important}
## Set the default orchestrator type for new nodes
The default orchestrator for new nodes is a setting in the Docker EE
The default orchestrator for new nodes is a setting in the Docker Enterprise
configuration file:
```
@ -193,4 +193,4 @@ The value can be `swarm` or `kubernetes`.
## Where to go next
- [Set up Docker EE by using a config file](ucp-configuration-file.md)
- [Set up Docker Enterprise by using a config file](ucp-configuration-file.md)

16
ee/ucp/admin/install/index.md
View File

@ -1,7 +1,7 @@
---
title: Install UCP for production
description: Learn how to install Docker Universal Control Plane on production.
keywords: Universal Control Plane, UCP, install, Docker EE
keywords: Universal Control Plane, UCP, install, Docker Enterprise
---
Docker Universal Control Plane (UCP) is a containerized application that you
@ -12,20 +12,20 @@ can install on-premise or on a cloud infrastructure.
The first step to installing UCP is ensuring that your infrastructure has all
of the [requirements UCP needs to run](system-requirements.md).
Also, you need to ensure that all nodes, physical and virtual, are running
the same version of Docker Enterprise Edition.
the same version of Docker Enterprise.
## Step 2: Install Docker EE on all nodes
## Step 2: Install Docker Enterprise on all nodes
UCP is a containerized application that requires the commercially supported
Docker Engine to run.
Install Docker EE on each host that you plan to manage with UCP.
Install Docker Enterprise on each host that you plan to manage with UCP.
View the [supported platforms](/engine/installation/#supported-platforms)
and click on your platform to get platform-specific instructions for installing
Docker EE.
Docker Enterprise.
Make sure you install the same Docker EE version on all the nodes. Also,
if you're creating virtual machine templates with Docker EE already
Make sure you install the same Docker Enterprise version on all the nodes. Also,
if you're creating virtual machine templates with Docker Enterprise already
installed, make sure the `/etc/docker/key.json` file is not included in the
virtual machine image. When provisioning the virtual machine, restart the Docker
daemon to generate a new `/etc/docker/key.json` file.
@ -90,7 +90,7 @@ Make sure all options shown in the following screen shot are unchecked:
## Step 5: License your installation
Now that UCP is installed, you need to license it. To use UCP you are required to have a Docker EE standard or advanced subscription, or you can test the platform with a free trial license.
Now that UCP is installed, you need to license it. To use UCP you are required to have a Docker Enterprise standard or advanced subscription, or you can test the platform with a free trial license.
1. Go to [Docker Hub](https://hub.docker.com/editions/enterprise/docker-ee-trial/trial)
to get a free trial license.

2
ee/ucp/admin/install/plan-installation.md
View File

@ -18,7 +18,7 @@ machines) that you'll manage with UCP:
## Hostname strategy
Docker UCP requires Docker Enterprise Edition. Before installing Docker EE on
Docker UCP requires Docker Enterprise. Before installing Docker Enterprise on
your cluster nodes, you should plan for a common hostname strategy.
Decide if you want to use short hostnames, like `engine01`, or Fully Qualified

10
ee/ucp/admin/install/system-requirements.md
View File

@ -1,7 +1,7 @@
---
title: UCP System requirements
description: Learn about the system requirements for installing Docker Universal Control Plane.
keywords: UCP, architecture, requirements, Docker EE
keywords: UCP, architecture, requirements, Docker Engine - Enterprise
redirect_from:
- /enterprise/admin/install/system-requirements/
---
@ -13,7 +13,7 @@ Before installing, be sure your infrastructure has these requirements.
You can install UCP on-premises or on a cloud provider. Common requirements:
* [Docker EE Engine](/ee/supported-platforms.md) version {{ site.docker_ee_version }}
* [Docker Engine - Enterprise](/ee/supported-platforms.md) version {{ site.docker_ee_version }}
* Linux kernel version 3.10 or higher
* [A static IP address for each node in the cluster](/ee/ucp/admin/install/plan-installation/#static-ip-addresses)
@ -37,7 +37,7 @@ Note that Windows container images are typically larger than Linux container ima
this reason, you should provision more local storage for Windows
nodes and for any DTR setups that store Windows container images.
Also, make sure the nodes are running an [operating system support by Docker EE](https://success.docker.com/Policies/Compatibility_Matrix).
Also, make sure the nodes are running an [operating system support by Docker Enterprise](https://success.docker.com/Policies/Compatibility_Matrix).
For highly-available installations, you also need a way to transfer files
between hosts.
@ -140,9 +140,9 @@ unexpected behavior may cause poor performance or even failures.
## Compatibility and maintenance lifecycle
Docker EE is a software subscription that includes three products:
Docker Enterprise is a software subscription that includes three products:
* Docker Engine with enterprise-grade support
* Docker Engine - Enterprise with enterprise-grade support
* Docker Trusted Registry
* Docker Universal Control Plane

2
ee/ucp/admin/install/upgrade.md
View File

@ -13,7 +13,7 @@ Before upgrading to a new version of UCP, check the
There you'll find information about new features, breaking changes, and
other relevant information for upgrading to a particular version.
As part of the upgrade process, you'll upgrade the Docker EE Engine
As part of the upgrade process, you'll upgrade the Docker Engine - Enterprise
installed on each node of the cluster to version 19.03 or higher.
You should plan for the upgrade to take place outside of business hours,
to ensure there's minimal impact to your users.

2
ee/ucp/authorization/create-teams-with-ldap.md
View File

@ -14,7 +14,7 @@ To enable LDAP in UCP and sync to your LDAP directory:
6. Manually create teams in UCP to mirror those in LDAP.
6. Click **Sync Now**.
If Docker EE is configured to sync users with your organization's LDAP directory
If Docker Enterprise is configured to sync users with your organization's LDAP directory
server, you can enable syncing the new team's members when creating a new team
or when modifying settings of an existing team.

2
ee/ucp/authorization/create-users-and-teams-manually.md
View File

@ -25,7 +25,7 @@ acme-datacenter
## Authentication
All users are authenticated on the backend. Docker EE provides built-in
All users are authenticated on the backend. Docker Enterprise provides built-in
authentication and also integrates with LDAP directory services.
To use Docker EE's built-in authentication, you must [create users manually](#create-users-manually).

2
ee/ucp/authorization/deploy-stateless-app.md
View File

@ -9,7 +9,7 @@ team with role-based access control (RBAC).
## Scenario
You are the Docker EE system administrator at Acme Company and need to configure
You are the Docker Enteprise system administrator at Acme Company and need to configure
permissions to company resources. The best way to do this is to:
- Build the organization with teams and users.

4
ee/ucp/authorization/ee-advanced.md
View File

@ -1,6 +1,6 @@
---
title: Access control design with Docker EE Advanced
description: Learn how to architect multitenancy with Docker Enterprise Edition Advanced.
title: Access control design with Docker Enterprise
description: Learn how to architect multitenancy with Docker Enterprise.
keywords: authorize, authentication, users, teams, groups, sync, UCP, role, access control
---

2
ee/ucp/authorization/grant-permissions.md
View File

@ -6,7 +6,7 @@ redirect_from:
- /datacenter/ucp/3.0/guides/authorization/grant-permissions/
---
Docker EE administrators can create _grants_ to control how users and
Docker Enterprise administrators can create _grants_ to control how users and
organizations access [resource sets](group-resources.md).
A grant defines _who_ has _how much_ access to _what_ resources. Each grant is a

18
engine/ce-ee-node-activate.md
View File

@ -1,37 +1,37 @@
---
description: Engine
keywords: Engine, CE, EE, node, activation, enterprise, patching
keywords: Engine, Docker Engine - Community, EE, node, activation, enterprise, patching
title: CE-EE Node Activate
---
The Docker Engine `18.09` release introduces a new feature called **CE-EE Node Activate**, which allows a user to perform an in-place seamless activation of the Enterprise engine feature set on an existing Community Edition (CE) node through the Docker command line.
The Docker Engine `18.09` release introduces a new feature called **CE-EE Node Activate**, which allows a user to perform an in-place seamless activation of the Enterprise engine feature set on an existing Docker Engine - Community node through the Docker command line.
CE-EE Node Activate will apply a license, and switch the Docker engine to the Enterprise engine binary.
## Requirements:
* The Docker Community Edition (CE) version must be 18.09 or higher.
* The Docker Engine - Community version must be 18.09 or higher.
* All of the Docker packages must be installed: docker-cli, docker-server, and containerd.
## Limitations
* This feature is only supported on x86 Linux nodes.
* Windows nodes are not currently supported.
* Node-level Engine activation between CE and EE is only supported in the same version of Docker Enterprise Engine for Docker.
* Prior versions of Docker CE do not support this feature.
* Node-level Engine activation between Docker Engine - Community and EE is only supported in the same version of Docker Enterprise Engine for Docker.
* Prior versions of Docker Engine - Community do not support this feature.
## Notes on patching after running CE to EE Node Activation
## Notes on patching after running Docker Engine - Community to EE Node Activation
Docker recommends replacing the apt or yum repository from CE with the EE repository that appears
Docker recommends replacing the apt or yum repository from Docker Engine - Community with the EE repository that appears
on your hub/store account after starting the trial or paid license. This allows apt/yum
upgrade operations to work as expected and keep them current as long as your license is still
valid and has not expired.
> **Note**: You can use the `docker engine update` command. However, if you continue to use
> the CE packages, the OS package will no longer replace the active daemon binary during apt/yum
> the Docker Engine - Community packages, the OS package will no longer replace the active daemon binary during apt/yum
> updates, so you are responsible for performing the `docker engine update` operation periodically
> to keep your engine up to date.
## Docker Engine 18.09 CE to EE Node Activation Process
## Docker Engine 18.09 Docker Engine - Community to EE Node Activation Process
The activation can be performed either online with connection to Docker Hub, or offline.

6
engine/release-notes.md
View File

@ -1,6 +1,6 @@
---
title: Docker Engine release notes
description: Learn about the new features, bug fixes, and breaking changes for Docker Engine CE and EE
description: Learn about the new features, bug fixes, and breaking changes for Docker Engine - Community and EE
keywords: docker, docker engine, ee, ce, whats new, release notes
toc_min: 1
toc_max: 2
@ -10,9 +10,9 @@ redirect_from:
---
This document describes the latest changes, additions, known issues, and fixes
for Docker Engine Enterprise Edition (Docker EE) and Community Edition (CE).
for Docker Engine - Enterprise and Docker Engine - Community.
Docker EE is a superset of all the features in Docker CE. It incorporates defect fixes
Docker EE is a superset of all the features in Docker Docker Engine - Community. It incorporates defect fixes
that you can use in environments where new features cannot be adopted as quickly for
consistency and compatibility reasons.

2
get-started/part6.md
View File

@ -1,7 +1,7 @@
---
title: "Get Started, Part 6: Deploy your app"
keywords: deploy, production, datacenter, cloud, aws, azure, provider, admin, enterprise
description: Deploy your app to production using Docker CE or EE.
description: Deploy your app to production using Docker Engine - Community or EE.
---
{% include_relative nav.html selected="6" %}

12
index.md
View File

@ -27,9 +27,9 @@ production servers in the cloud. Total reading time is less than an hour.
Run your solution in production with Docker Enterprise to get a
management dashboard, security scanning, LDAP integration, content signing,
multi-cloud support, and more. Click below to test-drive a running instance of
Docker EE without installing anything.
Docker Enterprise without installing anything.
[Try Docker Enterprise Edition](https://trial.docker.com){: class="button outline-btn" onclick="ga('send', 'event', 'EE Trial Referral', 'Front Page', 'Click');"}
[Try Docker Enterprise](https://trial.docker.com){: class="button outline-btn" onclick="ga('send', 'event', 'EE Trial Referral', 'Front Page', 'Click');"}
</div>
</div>
@ -39,7 +39,7 @@ Docker EE without installing anything.
<div class="row">
<div markdown="1" class="col-xs-12 col-sm-12 col-md-12 col-lg-6 block">
### Docker Community Edition
### Docker Engine - Community
Get started with Docker and experimenting with container-based apps. Docker CE
is available on many platforms, from desktop to cloud to server. Build and share
@ -52,17 +52,17 @@ channel for more predictability.
</div>
<div markdown="1" class="col-xs-12 col-sm-12 col-md-12 col-lg-6 block">
### Docker Enterprise Platform
### Docker Enterprise
Designed for enterprise development and IT teams who build, ship, and run
business critical applications in production at scale. Integrated, certified,
and supported to provide enterprises with the most secure container platform in
the industry to modernize all applications. Docker Enterprise Advanced comes with enterprise
the industry to modernize all applications. Docker Enterprise comes with enterprise
[add-ons](#docker-ee-add-ons) like Universal Control Plane (UCP) for managing and
orchestrating the container runtime, and Docker Trusted Registry (DTR) for storing and
securing images in an enterprise grade registry.
[Learn more about Docker Enterprise](/ee/supported-platforms/){: class="button outline-btn"}
[Learn more about Docker Enterprise supported platforms](/ee/supported-platforms/){: class="button outline-btn"}
</div>
</div><!-- end row -->

32
install/index.md
View File

@ -1,7 +1,7 @@
---
title: About Docker CE
title: About Docker Engine - Community
description: Lists the installation methods
keywords: docker, installation, install, docker ce, docker ee, docker editions, stable, edge
keywords: docker, installation, install, Docker Engine - Community, docker ee, docker editions, stable, edge
redirect_from:
- /installation/
- /engine/installation/linux/
@ -17,20 +17,20 @@ redirect_from:
- /en/latest/installation/
---
Docker Community Edition (CE) is ideal for developers and small
Docker Engine - Community is ideal for developers and small
teams looking to get started with Docker and experimenting with container-based
apps. Docker CE has three types of update channels, **stable**, **test**, and **nightly**:
apps. Docker Engine - Community has three types of update channels, **stable**, **test**, and **nightly**:
* **Stable** gives you latest releases for general availability.
* **Test** gives pre-releases that are ready for testing before general availability.
* **Nightly** gives you latest builds of work in progress for the next major release.
For more information about Docker CE, see
[Docker Community Edition](https://www.docker.com/community-edition/){: target="_blank" class="_" }.
For more information about Docker Engine - Community see
[Docker Engine - Community](https://www.docker.com/community-edition/){: target="_blank" class="_" }.
## Releases
For the Docker CE engine, the open
For the Docker Engine - Community engine, the open
repositories [Docker Engine](https://github.com/docker/engine) and
[Docker Client](https://github.com/docker/cli) apply.
@ -47,7 +47,7 @@ The cadence of the year-month releases is every 6 months starting with
the `18.09` release. The patch releases for a year-month release take
place as needed to address bug fixes during its support cycle.
Docker CE binaries for a release are available on [download.docker.com](https://download.docker.com/)
Docker Engine - Community binaries for a release are available on [download.docker.com](https://download.docker.com/)
as packages for the supported operating systems. Docker EE binaries are
available on the [Docker Hub](https://hub.docker.com/) for the supported operating systems. The
release channels are available for each of the year-month releases and
@ -98,17 +98,17 @@ Binaries built from this releases are available in the stable channel
`stable-YY.mm`, for example `stable-18.09`, as well as the corresponding
test channel.
### Relationship between CE and EE code
### Relationship between Docker Engine - Community and EE code
For a given year-month release, Docker releases both CE and EE
For a given year-month release, Docker releases both Docker Engine - Community and EE
variants concurrently. EE is a superset of the code delivered in
CE. Docker maintains publicly visible repositories for the CE code
CE. Docker maintains publicly visible repositories for the Docker Engine - Community code
as well as private repositories for the EE code. Automation (a bot)
is used to keep the branches between CE and EE in sync so as features
and fixes are merged on the various branches in the CE repositories
is used to keep the branches between Docker Engine - Community and EE in sync so as features
and fixes are merged on the various branches in the Docker Engine - Community repositories
(upstream), the corresponding EE repositories and branches are kept
in sync (downstream). While Docker and its partners make every effort
to minimize merge conflicts between CE and EE, occasionally they will
to minimize merge conflicts between Docker Engine - Community and EE, occasionally they will
happen, and Docker will work hard to resolve them in a timely fashion.
## Next release
@ -118,7 +118,7 @@ of the repository.
## Support
Docker CE releases of a year-month branch are supported with patches
Docker Engine - Community releases of a year-month branch are supported with patches
as needed for 7 months after the first year-month general availability
release. Docker EE releases are supported for 24 months after the first
year-month general availability release.
@ -144,7 +144,7 @@ but are not ruling it out in the future.
### Supported platforms
Docker CE is available on multiple platforms. Use the following tables
Docker Engine - Community is available on multiple platforms. Use the following tables
to choose the best installation path for you.
#### Desktop

8
install/linux/docker-ce/binaries.md
View File

@ -1,7 +1,7 @@
---
description: Instructions for installing Docker as a binary. Mostly meant for hackers who want to try out Docker on a variety of environments.
keywords: binaries, installation, docker, documentation, linux
title: Install Docker CE from binaries
title: Install Docker Engine - Community from binaries
redirect_from:
- /engine/installation/binaries/
- /engine/installation/linux/docker-ce/binaries/
@ -79,7 +79,7 @@ instructions for enabling and configuring AppArmor or SELinux.
[https://download.docker.com/linux/static/stable/](https://download.docker.com/linux/static/stable/)
(or change `stable` to `nightly` or `test`),
choose your hardware platform, and download the `.tgz` file relating to the
version of Docker CE you want to install.
version of Docker Engine - Community you want to install.
2. Extract the archive using the `tar` utility. The `dockerd` and `docker`
binaries are extracted.
@ -124,7 +124,7 @@ The macOS binary includes the Docker client only. It does not include the
1. Download the static binary archive. Go to
[https://download.docker.com/mac/static/stable/x86_64/](https://download.docker.com/mac/static/stable/x86_64/),
(or change `stable` to `nightly` or `test`),
and download the `.tgz` file relating to the version of Docker CE you want
and download the `.tgz` file relating to the version of Docker Engine - Community you want
to install.
2. Extract the archive using the `tar` utility. The `docker` binary is
@ -155,7 +155,7 @@ The macOS binary includes the Docker client only. It does not include the
## Upgrade static binaries
To upgrade your manual installation of Docker CE, first stop any
To upgrade your manual installation of Docker Engine - Community, first stop any
`dockerd` or `dockerd.exe` processes running locally, then follow the
regular installation steps to install the new version on top of the existing
version.

44
install/linux/docker-ce/centos.md
View File

@ -1,16 +1,16 @@
---
description: Instructions for installing Docker CE on CentOS
description: Instructions for installing Docker Engine - Community on CentOS
keywords: requirements, apt, installation, centos, rpm, install, uninstall, upgrade, update
redirect_from:
- /engine/installation/centos/
- /engine/installation/linux/docker-ce/centos/
- /install/linux/centos/
- /engine/installation/linux/centos/
title: Get Docker CE for CentOS
title: Get Docker Engine - Community for CentOS
toc_max: 4
---
To get started with Docker CE on CentOS, make sure you
To get started with Docker Engine - Community on CentOS, make sure you
[meet the prerequisites](#prerequisites), then
[install Docker](#install-docker-ce).
@ -27,7 +27,7 @@ To learn more about Docker EE, see
### OS requirements
To install Docker CE, you need a maintained version of CentOS 7. Archived
To install Docker Engine - Community, you need a maintained version of CentOS 7. Archived
versions aren't supported or tested.
The `centos-extras` repository must be enabled. This repository is enabled by
@ -55,11 +55,11 @@ $ sudo yum remove docker \
It's OK if `yum` reports that none of these packages are installed.
The contents of `/var/lib/docker/`, including images, containers, volumes, and
networks, are preserved. The Docker CE package is now called `docker-ce`.
networks, are preserved. The Docker Engine - Community package is now called `docker-ce`.
## Install Docker CE
## Install Docker Engine - Community
You can install Docker CE in different ways, depending on your needs:
You can install Docker Engine - Community in different ways, depending on your needs:
- Most users
[set up Docker's repositories](#install-using-the-repository) and install
@ -76,7 +76,7 @@ You can install Docker CE in different ways, depending on your needs:
### Install using the repository
Before you install Docker CE for the first time on a new host machine, you need
Before you install Docker Engine - Community 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.
@ -128,9 +128,9 @@ from the repository.
>
> [Learn about **nightly** and **test** channels](/install/index.md).
#### Install Docker CE
#### Install Docker Engine - Community
1. Install the _latest version_ of Docker CE and containerd, or go to the next step to install a specific version:
1. Install the _latest version_ of Docker Engine - Community and containerd, or go to the next step to install a specific version:
```bash
$ sudo yum install docker-ce docker-ce-cli containerd.io
@ -148,7 +148,7 @@ from the repository.
Docker is installed but not started. The `docker` group is created, but no users are added to the group.
2. To install a _specific version_ of Docker CE, list the available versions
2. To install a _specific version_ of Docker Engine - Community, list the available versions
in the repo, then select and install:
a. List and sort the versions available in your repo. This example sorts
@ -183,7 +183,7 @@ from the repository.
$ sudo systemctl start docker
```
4. Verify that Docker CE is installed correctly by running the `hello-world`
4. Verify that Docker Engine - Community is installed correctly by running the `hello-world`
image.
```bash
@ -193,21 +193,21 @@ 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 CE is installed and running. You need to use `sudo` to run Docker
Docker Engine - Community is installed and running. 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 CE
#### Upgrade Docker Engine - Community
To upgrade Docker CE, follow the [installation instructions](#install-docker-ce),
To upgrade Docker Engine - Community, follow the [installation instructions](#install-docker-ce),
choosing the new version you want to install.
### Install from a package
If you cannot use Docker's repository to install Docker, 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 CE.
a new file each time you want to upgrade Docker Engine - Community.
1. Go to
[{{ download-url-base }}/7/x86_64/stable/Packages/]({{ download-url-base }}/7/x86_64/stable/Packages/)
@ -217,7 +217,7 @@ a new file each time you want to upgrade Docker CE.
> change the word `stable` in the above URL to `nightly` or `test`.
> [Learn about **nightly** and **test** channels](/install/index.md).
2. Install Docker CE, changing the path below to the path where you downloaded
2. Install Docker Engine - Community, changing the path below to the path where you downloaded
the Docker package.
```bash
@ -233,7 +233,7 @@ a new file each time you want to upgrade Docker CE.
$ sudo systemctl start docker
```
4. Verify that Docker CE is installed correctly by running the `hello-world`
4. Verify that Docker Engine - Community is installed correctly by running the `hello-world`
image.
```bash
@ -243,20 +243,20 @@ a new file each time you want to upgrade Docker CE.
This command downloads a test image and runs it in a container. When the
container runs, it prints an informational message and exits.
Docker CE is installed and running. You need to use `sudo` to run Docker commands.
Docker Engine - Community 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.
#### Upgrade Docker CE
#### Upgrade Docker Engine - Community
To upgrade Docker CE, download the newer package file and repeat the
To upgrade Docker Engine - Community, download the newer package file and repeat the
[installation procedure](#install-from-a-package), using `yum -y upgrade`
instead of `yum -y install`, and pointing to the new file.
{% include install-script.md %}
## Uninstall Docker CE
## Uninstall Docker Engine - Community
1. Uninstall the Docker package:

50
install/linux/docker-ce/debian.md
View File

@ -1,16 +1,16 @@
---
description: Instructions for installing Docker CE on Debian
description: Instructions for installing Docker Engine - Community on Debian
keywords: requirements, apt, installation, debian, install, uninstall, upgrade, update
redirect_from:
- /engine/installation/debian/
- /engine/installation/linux/raspbian/
- /engine/installation/linux/debian/
- /engine/installation/linux/docker-ce/debian/
title: Get Docker CE for Debian
title: Get Docker Engine - Community for Debian
toc_max: 4
---
To get started with Docker CE on Debian, make sure you
To get started with Docker Engine - Community on Debian, make sure you
[meet the prerequisites](#prerequisites), then
[install Docker](#install-docker-ce).
@ -24,13 +24,13 @@ and distributions for different Docker editions, see
### OS requirements
To install Docker CE, you need the 64-bit version of one of these Debian or
To install Docker Engine - Community, you need the 64-bit version of one of these Debian or
Raspbian versions:
- Buster 10
- Stretch 9 (stable) / Raspbian Stretch
Docker CE is supported on `x86_64` (or `amd64`), `armhf`, and `arm64` architectures.
Docker Engine - Community is supported on `x86_64` (or `amd64`), `armhf`, and `arm64` architectures.
### Uninstall old versions
@ -44,11 +44,11 @@ $ sudo apt-get remove docker docker-engine docker.io containerd runc
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 CE package is now called `docker-ce`.
networks, are preserved. The Docker Engine - Community package is now called `docker-ce`.
## Install Docker CE
## Install Docker Engine - Community
You can install Docker CE in different ways, depending on your needs:
You can install Docker Engine - Community in different ways, depending on your needs:
- Most users
[set up Docker's repositories](#install-using-the-repository) and install
@ -66,7 +66,7 @@ You can install Docker CE in different ways, depending on your needs:
### Install using the repository
Before you install Docker CE for the first time on a new host machine, you need
Before you install Docker Engine - Community 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.
@ -164,7 +164,7 @@ from the repository.
</div>
</div> <!-- tab-content -->
#### Install Docker CE
#### Install Docker Engine - Community
> **Note**: This procedure works for Debian on `x86_64` / `amd64`, Debian ARM,
> or Raspbian.
@ -175,7 +175,7 @@ from the repository.
$ sudo apt-get update
```
2. Install the _latest version_ of Docker CE and containerd, or go to the next step to install a specific version:
2. Install the _latest version_ of Docker Engine - Community and containerd, or go to the next step to install a specific version:
```bash
$ sudo apt-get install docker-ce docker-ce-cli containerd.io
@ -188,7 +188,7 @@ from the repository.
> `apt-get update` command always installs the highest possible version,
> which may not be appropriate for your stability needs.
3. To install a _specific version_ of Docker CE, list the available versions in the repo, then select and install:
3. To install a _specific version_ of Docker Engine - Community, list the available versions in the repo, then select and install:
a. List the versions available in your repo:
@ -209,7 +209,7 @@ from the repository.
$ sudo apt-get install docker-ce=<VERSION_STRING> docker-ce-cli=<VERSION_STRING> containerd.io
```
4. Verify that Docker CE is installed correctly by running the `hello-world`
4. Verify that Docker Engine - Community is installed correctly by running the `hello-world`
image.
```bash
@ -219,34 +219,34 @@ 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 CE is installed and running. The `docker` group is created but no users
Docker Engine - Community 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 CE
#### Upgrade Docker Engine - Community
To upgrade Docker CE, first run `sudo apt-get update`, then follow the
To upgrade Docker Engine - Community, first run `sudo apt-get update`, then follow the
[installation instructions](#install-docker-ce), choosing the new version you want
to install.
### Install from a package
If you cannot use Docker's repository to install Docker CE, you can download the
If you cannot use Docker's repository to install Docker Engine - Community, 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.
1. Go to [`{{ download-url-base }}/dists/`]({{ download-url-base }}/dists/){: target="_blank" class="_" },
choose your Debian version, browse to `pool/stable/`, choose `amd64`,
`armhf`, or `arm64` and download the `.deb` file for the Docker CE version
`armhf`, or `arm64` and download the `.deb` file for the Docker Engine - Community version
you want to install.
> **Note**: To install a **nightly** package, change the word
> `stable` in the URL to `nightly`.
> [Learn about **nightly** and **test** channels](/install/index.md).
2. Install Docker CE, changing the path below to the path where you downloaded
2. Install Docker Engine - Community, changing the path below to the path where you downloaded
the Docker package.
```bash
@ -255,7 +255,7 @@ a new file each time you want to upgrade Docker.
The Docker daemon starts automatically.
3. Verify that Docker CE is installed correctly by running the `hello-world`
3. Verify that Docker Engine - Community is installed correctly by running the `hello-world`
image.
```bash
@ -265,22 +265,22 @@ a new file each time you want to upgrade Docker.
This command downloads a test image and runs it in a container. When the
container runs, it prints an informational message and exits.
Docker CE is installed and running. The `docker` group is created but no users
Docker Engine - Community 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 CE
#### Upgrade Docker Engine - Community
To upgrade Docker CE, download the newer package file and repeat the
To upgrade Docker Engine - Community, download the newer package file and repeat the
[installation procedure](#install-from-a-package), pointing to the new file.
{% include install-script.md %}
## Uninstall Docker CE
## Uninstall Docker Engine - Community
1. Uninstall the Docker CE package:
1. Uninstall the Docker Engine - Community package:
```bash
$ sudo apt-get purge docker-ce

42
install/linux/docker-ce/fedora.md
View File

@ -1,15 +1,15 @@
---
description: Instructions for installing Docker CE on Fedora
description: Instructions for installing Docker Engine - Community on Fedora
keywords: requirements, apt, installation, fedora, rpm, install, uninstall, upgrade, update
redirect_from:
- /engine/installation/fedora/
- /engine/installation/linux/fedora/
- /engine/installation/linux/docker-ce/fedora/
title: Get Docker CE for Fedora
title: Get Docker Engine - Community for Fedora
toc_max: 4
---
To get started with Docker CE on Fedora, make sure you
To get started with Docker Engine - Community on Fedora, make sure you
[meet the prerequisites](#prerequisites), then
[install Docker](#install-docker-ce).
@ -49,11 +49,11 @@ $ sudo dnf remove docker \
It's OK if `dnf` reports that none of these packages are installed.
The contents of `/var/lib/docker/`, including images, containers, volumes, and
networks, are preserved. The Docker CE package is now called `docker-ce`.
networks, are preserved. The Docker Engine - Community package is now called `docker-ce`.
## Install Docker CE
## Install Docker Engine - Community
You can install Docker CE in different ways, depending on your needs:
You can install Docker Engine - Community in different ways, depending on your needs:
- Most users
[set up Docker's repositories](#install-using-the-repository) and install
@ -70,7 +70,7 @@ You can install Docker CE in different ways, depending on your needs:
### Install using the repository
Before you install Docker CE for the first time on a new host machine, you need
Before you install Docker Engine - Community 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.
@ -120,9 +120,9 @@ from the repository.
>
> [Learn about **nightly** and **test** channels](/install/index.md).
#### Install Docker CE
#### Install Docker Engine - Community
1. Install the _latest version_ of Docker CE and containerd, or go to the next step to install a specific version:
1. Install the _latest version_ of Docker Engine - Community and containerd, or go to the next step to install a specific version:
```bash
$ sudo dnf install docker-ce docker-ce-cli containerd.io
@ -140,7 +140,7 @@ from the repository.
Docker is installed but not started. The `docker` group is created, but no users are added to the group.
2. To install a _specific version_ of Docker CE, list the available versions
2. To install a _specific version_ of Docker Engine - Community, list the available versions
in the repo, then select and install:
a. List and sort the versions available in your repo. This example sorts
@ -175,7 +175,7 @@ from the repository.
$ sudo systemctl start docker
```
4. Verify that Docker CE is installed correctly by running the `hello-world`
4. Verify that Docker Engine - Community is installed correctly by running the `hello-world`
image.
```bash
@ -185,21 +185,21 @@ 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 CE is installed and running. You need to use `sudo` to run Docker
Docker Engine - Community is installed and running. 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 CE
#### Upgrade Docker Engine - Community
To upgrade Docker CE, follow the [installation instructions](#install-docker-ce),
To upgrade Docker Engine - Community, follow the [installation instructions](#install-docker-ce),
choosing the new version you want to install.
### Install from a package
If you cannot use Docker's repository to install Docker, 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 CE.
a new file each time you want to upgrade Docker Engine - Community.
1. Go to [{{ download-url-base }}/]({{ download-url-base }}/) and choose your
version of Fedora. Go to `x86_64/stable/Packages/`
@ -209,7 +209,7 @@ a new file each time you want to upgrade Docker CE.
> change the word `stable` in the above URL to `nightly` or `test`.
> [Learn about **nightly** and **test** channels](/install/index.md).
2. Install Docker CE, changing the path below to the path where you downloaded
2. Install Docker Engine - Community, changing the path below to the path where you downloaded
the Docker package.
```bash
@ -222,7 +222,7 @@ a new file each time you want to upgrade Docker CE.
$ sudo systemctl start docker
```
4. Verify that Docker CE is installed correctly by running the `hello-world`
4. Verify that Docker Engine - Community is installed correctly by running the `hello-world`
image.
```bash
@ -232,20 +232,20 @@ a new file each time you want to upgrade Docker CE.
This command downloads a test image and runs it in a container. When the
container runs, it prints an informational message and exits.
Docker CE is installed and running. You need to use `sudo` to run Docker commands.
Docker Engine - Community 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.
#### Upgrade Docker CE
#### Upgrade Docker Engine - Community
To upgrade Docker CE, download the newer package file and repeat the
To upgrade Docker Engine - Community, download the newer package file and repeat the
[installation procedure](#install-from-a-package), using `dnf -y upgrade`
instead of `dnf -y install`, and pointing to the new file.
{% include install-script.md %}
## Uninstall Docker CE
## Uninstall Docker Engine - Community
1. Uninstall the Docker package:

54
install/linux/docker-ce/ubuntu.md
View File

@ -1,5 +1,5 @@
---
description: Instructions for installing Docker CE on Ubuntu
description: Instructions for installing Docker Engine - Community on Ubuntu
keywords: requirements, apt, installation, ubuntu, install, uninstall, upgrade, update
redirect_from:
- /engine/installation/ubuntulinux/
@ -8,11 +8,11 @@ redirect_from:
- /engine/installation/linux/docker-ce/ubuntu/
- /install/linux/ubuntu/
- /engine/installation/linux/ubuntu/
title: Get Docker CE for Ubuntu
title: Get Docker Engine - Community for Ubuntu
toc_max: 4
---
To get started with Docker CE on Ubuntu, make sure you
To get started with Docker Engine - Community on Ubuntu, make sure you
[meet the prerequisites](#prerequisites), then
[install Docker](#install-docker-ce).
@ -29,14 +29,14 @@ To learn more about Docker EE, see
### OS requirements
To install Docker CE, you need the 64-bit version of one of these Ubuntu
To install Docker Engine - Community, you need the 64-bit version of one of these Ubuntu
versions:
- Cosmic 18.10
- Bionic 18.04 (LTS)
- Xenial 16.04 (LTS)
Docker CE is supported on `x86_64` (or `amd64`), `armhf`, `arm64`, `s390x`
Docker Engine - Community is supported on `x86_64` (or `amd64`), `armhf`, `arm64`, `s390x`
(IBM Z), and `ppc64le` (IBM Power) architectures.
### Uninstall old versions
@ -51,22 +51,22 @@ $ sudo apt-get remove docker docker-engine docker.io containerd runc
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 CE package is now called `docker-ce`.
networks, are preserved. The Docker Engine - Community package is now called `docker-ce`.
### Supported storage drivers
Docker CE on Ubuntu supports `overlay2`, `aufs` and `btrfs` storage drivers.
Docker Engine - Community on Ubuntu supports `overlay2`, `aufs` and `btrfs` storage drivers.
> **Note**: In Docker Engine - Enterprise, `btrfs` is only supported on SLES. See the documentation on
> [btrfs](/engine/userguide/storagedriver/btrfs-driver.md) for more details.
For new installations on version 4 and higher of the Linux kernel, `overlay2`
is supported and preferred over `aufs`. Docker CE uses the `overlay2`
is supported and preferred over `aufs`. Docker Engine - Community uses the `overlay2`
storage driver by default. If you need to use `aufs` instead, you need to
configure it manually. See [aufs](/engine/userguide/storagedriver/aufs-driver.md)
## Install Docker CE
## Install Docker Engine - Community
You can install Docker CE in different ways, depending on your needs:
You can install Docker Engine - Community in different ways, depending on your needs:
- Most users
[set up Docker's repositories](#install-using-the-repository) and install
@ -83,7 +83,7 @@ You can install Docker CE in different ways, depending on your needs:
### Install using the repository
Before you install Docker CE for the first time on a new host machine, you need
Before you install Docker Engine - Community 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.
@ -199,7 +199,7 @@ from the repository.
</div>
</div> <!-- tab-content -->
#### Install Docker CE
#### Install Docker Engine - Community
1. Update the `apt` package index.
@ -207,7 +207,7 @@ from the repository.
$ sudo apt-get update
```
2. Install the _latest version_ of Docker CE and containerd, or go to the next step to install a specific version:
2. Install the _latest version_ of Docker Engine - Community and containerd, or go to the next step to install a specific version:
```bash
$ sudo apt-get install docker-ce docker-ce-cli containerd.io
@ -220,7 +220,7 @@ from the repository.
> `apt-get update` command always installs the highest possible version,
> which may not be appropriate for your stability needs.
3. To install a _specific version_ of Docker CE, list the available versions in the repo, then select and install:
3. To install a _specific version_ of Docker Engine - Community, list the available versions in the repo, then select and install:
a. List the versions available in your repo:
@ -241,7 +241,7 @@ from the repository.
$ sudo apt-get install docker-ce=<VERSION_STRING> docker-ce-cli=<VERSION_STRING> containerd.io
```
4. Verify that Docker CE is installed correctly by running the `hello-world`
4. Verify that Docker Engine - Community is installed correctly by running the `hello-world`
image.
```bash
@ -251,34 +251,34 @@ 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 CE is installed and running. The `docker` group is created but no users
Docker Engine - Community 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 CE
#### Upgrade Docker Engine - Community
To upgrade Docker CE, first run `sudo apt-get update`, then follow the
To upgrade Docker Engine - Community, first run `sudo apt-get update`, then follow the
[installation instructions](#install-docker-ce), choosing the new version you want
to install.
### Install from a package
If you cannot use Docker's repository to install Docker CE, you can download the
If you cannot use Docker's repository to install Docker Engine - Community, 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.
1. Go to [`{{ download-url-base }}/dists/`]({{ download-url-base }}/dists/){: target="_blank" class="_" },
choose your Ubuntu version, browse to `pool/stable/`, choose `amd64`,
`armhf`, `arm64`, `ppc64el`, or `s390x`, and download the `.deb` file for the
Docker CE version you want to install.
Docker Engine - Community version you want to install.
> **Note**: To install a **nightly** package, change the word
> `stable` in the URL to `nightly`.
> [Learn about **nightly** and **test** channels](/install/index.md).
2. Install Docker CE, changing the path below to the path where you downloaded
2. Install Docker Engine - Community, changing the path below to the path where you downloaded
the Docker package.
```bash
@ -287,7 +287,7 @@ a new file each time you want to upgrade Docker.
The Docker daemon starts automatically.
3. Verify that Docker CE is installed correctly by running the `hello-world`
3. Verify that Docker Engine - Community is installed correctly by running the `hello-world`
image.
```bash
@ -297,22 +297,22 @@ a new file each time you want to upgrade Docker.
This command downloads a test image and runs it in a container. When the
container runs, it prints an informational message and exits.
Docker CE is installed and running. The `docker` group is created but no users
Docker Engine - Community 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 CE
#### Upgrade Docker Engine - Community
To upgrade Docker CE, download the newer package file and repeat the
To upgrade Docker Engine - Community, download the newer package file and repeat the
[installation procedure](#install-from-a-package), pointing to the new file.
{% include install-script.md %}
## Uninstall Docker CE
## Uninstall Docker Engine - Community
1. Uninstall the Docker CE package:
1. Uninstall the Docker Engine - Community package:
```bash
$ sudo apt-get purge docker-ce

2
install/linux/docker-ee/centos.md
View File

@ -44,7 +44,7 @@ On {{ linux-dist-long }}, Docker EE supports storage drivers, `overlay2` and `de
### 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 CE to Docker EE, remove the Docker CE package as well.
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.
```bash
$ sudo yum remove docker \

6
install/linux/docker-ee/ubuntu.md
View File

@ -16,8 +16,8 @@ To get started with Docker EE on Ubuntu, make sure you
## Prerequisites
Docker CE users should go to
[Get Docker CE for Ubuntu](/install/linux/docker-ce/ubuntu.md)
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
@ -44,7 +44,7 @@ check the [compatibility matrix](https://success.docker.com/article/compatibilit
### Uninstall old versions
Older versions of Docker were called `docker` or `docker-engine`. In addition,
if you are upgrading from Docker CE to Docker EE, remove the Docker CE package.
if you are upgrading from Docker Engine - Community to Docker EE, remove the Docker Engine - Community package.
```bash
$ sudo apt-get remove docker docker-engine docker-ce docker-ce-cli docker.io

4
install/windows/docker-ee.md
View File

@ -148,7 +148,7 @@ manually, via a script, or on air-gapped systems.
```
If you need to download a specific Docker EE Engine release, all URLs can be
found on this [JSON index](https://download.docker.com/components/engine/windows-server/index.json)
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,
@ -222,7 +222,7 @@ To update Docker Engine - Enterprise to the most recent release, specify the
```powershell
Install-Package -Name docker -ProviderName DockerMsftProvider -RequiredVersion {{ site.docker_ee_version }} -Update -Force
```
The required version number must match a versions available on the [JSON
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

2
network/network-tutorial-overlay.md
View File

@ -64,7 +64,7 @@ If you don't have three hosts handy, an easy solution is to set up three
Ubuntu hosts on a cloud provider such as Amazon EC2, all on the same network
with all communications allowed to all hosts on that network (using a mechanism
such as EC2 security groups), and then to follow the
[installation instructions for Docker CE on Ubuntu](/engine/installation/linux/docker-ce/ubuntu.md).
[installation instructions for Docker Engine - Community on Ubuntu](/engine/installation/linux/docker-ce/ubuntu.md).
### Walkthrough

4
storage/storagedriver/aufs-driver.md
View File

@ -9,7 +9,7 @@ redirect_from:
AUFS is a *union filesystem*. The `aufs` storage driver was previously the default
storage driver used for managing images and layers on Docker for Ubuntu, and for
Debian versions prior to Stretch. If your Linux kernel is version 4.0 or higher,
and you use Docker CE, consider using the newer
and you use Docker Engine - Community, consider using the newer
[overlay2](overlayfs-driver.md){: target="_blank" class="_" }, which has
potential performance advantages over the `aufs` storage driver.
@ -20,7 +20,7 @@ potential performance advantages over the `aufs` storage driver.
## Prerequisites
- For Docker CE, AUFS is supported on Ubuntu, and on Debian versions prior to
- For Docker Engine - Community, AUFS is supported on Ubuntu, and on Debian versions prior to
Stretch.
- For Docker EE, AUFS is supported on Ubuntu.
- If you use Ubuntu, you need to

4
storage/storagedriver/btrfs-driver.md
View File

@ -18,14 +18,14 @@ easily combine multiple physical block devices into a single Btrfs filesystem.
This article refers to Docker's Btrfs storage driver as `btrfs` and the overall
Btrfs Filesystem as Btrfs.
> **Note**: The `btrfs` storage driver is only supported on Docker CE on Ubuntu
> **Note**: The `btrfs` storage driver is only supported on Docker Engine - Community on Ubuntu
> or Debian, and Docker EE / CS Engine on SLES.
## Prerequisites
`btrfs` is supported if you meet the following prerequisites:
- **Docker CE**: For Docker CE, `btrfs` is only recommended on Ubuntu or Debian.
- **Docker Engine - Community**: For Docker Engine - Community, `btrfs` is only recommended on Ubuntu or Debian.
- **Docker EE**: For Docker EE and CS-Engine, `btrfs` is only supported on SLES.
See the

2
storage/storagedriver/device-mapper-driver.md
View File

@ -27,7 +27,7 @@ a filesystem at the operating system (OS) level.
EE on many OS distribution. See the
[Product compatibility matrix](https://success.docker.com/article/compatibility-matrix) for details.
- `devicemapper` is also supported on Docker CE running on CentOS, Fedora,
- `devicemapper` is also supported on Docker Engine - Community running on CentOS, Fedora,
Ubuntu, or Debian.
- Changing the storage driver makes any containers you have already

5
storage/storagedriver/index.md
View File

@ -16,7 +16,10 @@ your applications and avoid performance problems along the way.
Storage drivers allow you to create data in the writable layer of your container.
The files won't be persisted after the container is deleted, and both read and
write speeds are low.
write speeds are lower than native file system performance.
> **Note**: Operations that are known to be problematic include write-intensive database storage,
particularly when pre-existing data exists in the write-only layer. More details are provided in this document.
[Learn how to use volumes](../volumes.md) to persist data and improve performance.

2
storage/storagedriver/overlayfs-driver.md
View File

@ -25,7 +25,7 @@ storage driver as `overlay` or `overlay2`.
OverlayFS is supported if you meet the following prerequisites:
- The `overlay2` driver is supported on Docker CE, and Docker EE 17.06.02-ee5 and
- The `overlay2` driver is supported on Docker Engine - Community, and Docker EE 17.06.02-ee5 and
up, and is the recommended storage driver.
- Version 4.0 or higher of the Linux kernel, or RHEL or CentOS using
version 3.10.0-514 of the kernel or higher. If you use an older kernel, you need

2
storage/storagedriver/zfs-driver.md
View File

@ -29,7 +29,7 @@ use unless you have substantial experience with ZFS on Linux.
- ZFS requires one or more dedicated block devices, preferably solid-state
drives (SSDs).
- ZFS is only supported on Docker CE with Ubuntu 14.04 or higher, with the `zfs`
- ZFS is only supported on Docker Engine - Community with Ubuntu 14.04 or higher, with the `zfs`
package (16.04 and higher) or `zfs-native` and `ubuntu-zfs` packages (14.04)
installed.
- For Ubuntu 14.04, you need to enable a supplemental package repository