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

Minor wording updates

This commit is contained in:
paigehargrave 2019-06-15 07:52:58 -04:00 committed by GitHub
parent 6a6a150262
commit afd335fe05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ee/supported-platforms.md
View File

@ -1,6 +1,6 @@
--- ---
title: About Docker Enterprise title: About Docker Enterprise
description: Information about Docker Enterprise 2.1 description: Docker Enterprise product information
keywords: Docker Enterprise, enterprise, enterprise edition, ee, docker ee, docker enterprise edition, lts, commercial, cs engine, commercially supported keywords: Docker Enterprise, enterprise, enterprise edition, ee, docker ee, docker enterprise edition, lts, commercial, cs engine, commercially supported
redirect_from: redirect_from:
- /enterprise/supported-platforms/ - /enterprise/supported-platforms/
@ -14,27 +14,31 @@ install-prefix-ee: '/install/linux/docker-ee'
--- ---
Docker Enterprise is designed for enterprise development as well as IT teams who build, share, and run business-critical Docker Enterprise is designed for enterprise development as well as IT teams who build, share, and run business-critical
applications in production and at scale. Docker Enterprise is an integrated container platform that includes Docker Desktop Enterprise, a secure image registry, advanced management control plane and Docker Engine - Enterprise. Docker Engine - Enterprise is a certified and supported container runtime available as a standalone solution supported to provide enterprises with the most secure container engine applications at scale in production. Docker Enterprise is an integrated container platform that includes
in the industry. For more info about Docker Enterprise and Docker Engine - Enterprise, including purchasing Docker Desktop Enterprise, a secure image registry, advanced management control plane, and Docker Engine - Enterprise.
options, see [Docker Enterprise](https://www.docker.com/enterprise-edition/). Docker Engine - Enterprise is a certified and supported container runtime that is also available as a standalone
solution to provide enterprises with the most secure container engine in the industry. For more information
about Docker Enterprise and Docker Engine - Enterprise, including purchasing options,
see [Docker Enterprise](https://www.docker.com/enterprise-edition/).
> Compatibility Matrix > Compatibility Matrix
> >
> Refer to the [Compatibility Matrix](https://success.docker.com/article/compatibility-matrix) for the latest list of supported platforms. > Refer to the [Compatibility Matrix](https://success.docker.com/article/compatibility-matrix) for the latest list of supported platforms.
{: .important} {: .important}
## Docker Enterprise Products ## Docker Enterprise products
{% include docker_ee.md %} {% include docker_ee.md %}
> Note > Note
> >
> Starting with Docker Enterprise 2.1, Docker Enterprise - Basic is now Docker Engine - Enterprise and, Docker Enterprise - Standard, > Starting with Docker Enterprise 2.1, Docker Enterprise - Basic is now Docker Engine - Enterprise,
> and Docker Enterprise - Advanced are all now called Docker Enterprise. > and both Docker Enterprise - Standard and Docker Enterprise - Advanced are now called Docker Enterprise.
### Docker Enterprise ### Docker Enterprise
With Docker Enterprise, you manage your container workloads in a flexible way. You can manage workloads on Windows, Linux, on site, or on the cloud. With Docker Enterprise, you can manage container workloads on Windows, Linux, on site, or on the cloud
in a flexible way.
Docker Enterprise has private image management, integrated image signing policies, and cluster Docker Enterprise has private image management, integrated image signing policies, and cluster
management with support for Kubernetes and Swarm orchestrators. It allows you to implement management with support for Kubernetes and Swarm orchestrators. It allows you to implement
@ -42,7 +46,7 @@ node-based RBAC policies, image promotion policies, image mirroring, and
scan your images for vulnerabilities. It also has support with defined SLAs and extended scan your images for vulnerabilities. It also has support with defined SLAs and extended
maintenance cycles for patches for up to 24 months. maintenance cycles for patches for up to 24 months.
### New Licensing for Docker Enterprise ### New licensing for Docker Enterprise
Starting in version 18.09, Docker Enterprise is aware of the license applied on the system. The license summary is available in the `docker info` output on standalone or manager nodes. Starting in version 18.09, Docker Enterprise is aware of the license applied on the system. The license summary is available in the `docker info` output on standalone or manager nodes.
@ -63,8 +67,9 @@ Additionally, Docker is now distributing the CLI as a separate installation pack
### Docker Certified Infrastructure ### Docker Certified Infrastructure
Docker Certified Infrastructure is Docker’s prescriptive approach to deploying Docker Enterprise on a range of infrastructure choices. Each Docker Docker Certified Infrastructure is Docker’s prescriptive approach to deploying Docker Enterprise
Certified Infrastructure includes a reference architecture, a CLI plugin for automated deployment and configuration, and third-party ecosystem solution briefs. on a variety of infrastructures. Each Docker Certified Infrastructure option includes a reference architecture,
a CLI plugin for automated deployment and configuration, and third-party ecosystem solution briefs.
| Platform | Docker Enterprise support | | Platform | Docker Enterprise support |
:----------------------------------------------------------------------------------------|:-------------------------:| :----------------------------------------------------------------------------------------|:-------------------------:|
@ -72,8 +77,6 @@ Certified Infrastructure includes a reference architecture, a CLI plugin for aut
| VMware | coming soon | | VMware | coming soon |
| Microsoft Azure | coming soon | | Microsoft Azure | coming soon |
## Docker Enterprise release cycles ## Docker Enterprise release cycles
Each Docker Enterprise release is supported and maintained for 24 months, and Each Docker Enterprise release is supported and maintained for 24 months, and