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

branding changes 

Signed-off-by: Dawn W Docker <dawn.wood@users.noreply.github.com>
This commit is contained in:
Dawn W Docker 2019-06-11 15:25:57 -07:00
parent fdc2ef60f5
commit 8cdd6e27cc
12 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.