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

branding changes for EE 

Signed-off-by: Dawn W Docker <dawn.wood@users.noreply.github.com>
This commit is contained in:
Dawn W Docker 2019-06-12 08:31:02 -07:00
parent 6f79fe9332
commit b49e6e0d5c
16 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ 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 Engine - Enterprise from it. This is the recommended approach because installation and upgrades are managed with YUM and easier to do.
@ -28,7 +28,7 @@ For Docker Community Edition on {{ linux-dist-cap }}, see [Get Docker Engine - C
{% elsif section == "find-ee-repo-url" %}
To install Docker EE, you will need the URL of the Docker Engine - Enterprise 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 }}**.
@ -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" %}
@ -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

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}

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,