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:05:20 -07:00
parent 7b45982a0a
commit bf298eba11
11 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_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: |
@ -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

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

@ -15,9 +15,9 @@ Usage: {% include ee-linux-install-reuse.md 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="_" }
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 Engine - Community is _not_ supported on {{ linux-dist-long }}.
@ -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 EE repository associated with your trial or subscription:
To install Docker EE, you will need the URL of the Docker Engine - 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.
@ -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
@ -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

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

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 Docker Engine - Community 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

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

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

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.

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}