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

updated per GitIssue # 1176 

Signed-off-by: Dawn W Docker <dawn.wood@users.noreply.github.com>
This commit is contained in:
Dawn W Docker 2019-06-13 15:06:10 -07:00
parent 4b59c18aab
commit 72424dfb9a
1 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
ee/supported-platforms.md
View File

@ -24,20 +24,19 @@ options, see [Docker Enterprise](https://www.docker.com/enterprise-edition/).
> 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 EE tiers ## Docker Enterprise tiers
{% include docker_ee.md %} {% include docker_ee.md %}
> Note > Note
> >
> Starting with Docker Enterprise 2.1, Docker Enterprise --- Basic, Docker Enterprise --- Standard, > Starting with Docker Enterprise 2.1, Docker Enterprise - Basic, Docker Enterprise - Standard,
> and Docker Enterprise --- Advanced are all now called Docker Enterprise. > and Docker Enterprise - Advanced are all now called Docker Enterprise.
### Docker Enterprise ### Docker Engine - Enterprise
With Docker Enterprise, you can deploy Docker Engine --- Enterprise With Docker Enterprise, you can deploy Docker Engine - Enterprise
to manage your container workloads in a flexible way. You can manage workloads to manage your container workloads in a flexible way. You can manage workloads on Windows, Linux, on site, or on the cloud.
on Windows, Linux, on site, or on the cloud.
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
@ -47,43 +46,34 @@ maintenance cycles for patches for up to 24 months.
### New Licensing for Docker Enterprise ### New Licensing for Docker Enterprise
In version 18.09, the Docker Enterprise --- Engine is aware of the license applied on the system. The 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.
license summary is available in the `docker info` output on standalone or manager nodes.
For EE platform customers, when you license UCP, this same license is applied to the underlying For Docker Enterprise platform customers, when you license UCP, this same license is applied to the underlying engines in the cluster. Docker recommends platform customers use UCP to manage their license.
engines in the cluster. Docker recommends platform customers use UCP to manage their license.
Standalone EE engines can be licensed using `docker engine activate`. Standalone Docker Engine - Enterprise users can license engines using `docker engine activate`.
Offline activation of standalone EE engines can be performed by downloading the license and Offline activation of standalone Docker Engine - Enterprise can be performed by downloading the license and using the command `docker engine activate --license filename.lic`.
using the command `docker engine activate --license filename.lic`.
Additionally, Docker is now distributing the CLI as a separate installation package. Additionally, Docker is now distributing the CLI as a separate installation package. This gives Docker Enterprise users the ability to install as many CLI packages as needed without using the Engine node licenses for client-only systems.
This gives Enterprise users the ability to install as many CLI packages as needed
without using the Engine node licenses for client-only systems.
[Learn more about Docker Enterprise](/ee/index.md). [Learn more about Docker Enterprise](/ee/index.md).
> When using Docker Enterprise > When using Docker Enterprise
>
> IBM Power is not supported as managers or workers.
> Microsoft Windows Server is not supported as a manager. Microsoft Windows > Microsoft Windows Server is not supported as a manager. Microsoft Windows
> Server 1803 is not supported as a worker. > Server 1803 is not supported as a worker.
### Docker Certified Infrastructure ### Docker Certified Infrastructure
Docker Certified Infrastructure is Docker’s prescriptive approach to deploying Docker Certified Infrastructure is Docker’s prescriptive approach to deploying Docker Enterprise on a range of infrastructure choices. Each Docker
Docker Enterprise on a range of infrastructure choices. Each Docker Certified Infrastructure includes a reference architecture, automation templates, and third-party ecosystem solution briefs.
Certified Infrastructure includes a reference architecture, automation templates,
and third-party ecosystem solution briefs. | Platform | Docker Enterprise support |
:----------------------------------------------------------------------------------------|:-------------------------:|
| [Amazon Web Services](..\cluster\aws.md) | {{ page.green-check }} |
| VMware | coming soon |
| Microsoft Azure | coming soon |
| Platform | Docker Enterprise Edition |
|:----------------------------------------------------------------------------------------|:-------------------------:|
| [VMware](https://success.docker.com/article/certified-infrastructures-vmware-vsphere) | {{ page.green-check }} |
| [Amazon Web Services](https://success.docker.com/article/certified-infrastructures-aws) | {{ page.green-check }} |
| [Microsoft Azure](https://success.docker.com/article/certified-infrastructures-azure) | {{ page.green-check }} |
| IBM Cloud | Coming soon |
## Docker Enterprise release cycles ## Docker Enterprise release cycles
@ -91,9 +81,7 @@ and third-party ecosystem solution briefs.
Each Docker Enterprise release is supported and maintained for 24 months, and Each Docker Enterprise release is supported and maintained for 24 months, and
receives security and critical bug fixes during this period. receives security and critical bug fixes during this period.
The Docker API version is independent of the Docker platform version. We maintain The Docker API version is independent of the Docker platform version. We maintain careful API backward compatibility and deprecate APIs and features slowly and conservatively. We remove features after deprecating them for a period of
careful API backward compatibility and deprecate APIs and features slowly and
conservatively. We remove features after deprecating them for a period of
three stable releases. Docker 1.13 introduced improved interoperability three stable releases. Docker 1.13 introduced improved interoperability
between clients and servers using different API versions, including dynamic between clients and servers using different API versions, including dynamic
feature negotiation. feature negotiation.
@ -101,10 +89,8 @@ feature negotiation.
## Upgrades and support ## Upgrades and support
If you're a Docker DDC or CS Engine customer, you don't need to upgrade to If you're a Docker DDC or CS Engine customer, you don't need to upgrade to
Docker Enterprise to continue to get support. We will continue to support customers Docker Enterprise to continue to get support. We will continue to support customers with valid subscriptions whether the subscription covers Docker EE or Commercially Supported Docker. You can choose to stay with your current
with valid subscriptions whether the subscription covers Docker EE or deployed version, or you can upgrade to the latest Docker Enterprise version. For
Commercially Supported Docker. You can choose to stay with your current
deployed version, or you can upgrade to the latest Docker EE version. For
more info, see [Scope of Coverage and Maintenance more info, see [Scope of Coverage and Maintenance
Lifecycle](https://success.docker.com/Policies/Scope_of_Support). Lifecycle](https://success.docker.com/Policies/Scope_of_Support).