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

Update for Docker Enterprise name changes (#7371) 

* Update for Docker Enterprise name changes

Changed page to reflect new Docker Enterprise naming conventions

* Update supported-platforms.md
This commit is contained in:
Jim Armstrong 2019-07-17 13:40:27 -07:00 committed by Adrian Plata
parent 3ac68e1271
commit 5882fca77f
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ee/supported-platforms.md
View File

@ -13,18 +13,20 @@ green-check: '![yes](/install/images/green-check.svg){: style="height: 14px; mar
install-prefix-ee: '/install/linux/docker-ee' install-prefix-ee: '/install/linux/docker-ee'
--- ---
Docker Enterprise is designed for enterprise development as well as IT teams who build, ship, and run business-critical Docker Enterprise is designed for enterprise development as well as IT teams who
applications in production and at scale. Docker Enterprise is integrated, certified, build, ship, and run business-critical applications
in production and at scale. Docker Enterprise is integrated, certified,
and supported to provide enterprises with the most secure container platform and supported to provide enterprises with the most secure container platform
in the industry. For more info about Docker Enterprise, including purchasing in the industry. For more info about Docker Enterprise, including purchasing
options, see [Docker Enterprise](https://www.docker.com/enterprise-edition/). 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 EE tiers ## Docker Enterprise tiers
{% include docker_ce_ee.md %} {% include docker_ce_ee.md %}
@ -47,20 +49,23 @@ 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 In version 18.09, the Docker Enterprise --- Engine is aware of the license
license summary is available in the `docker info` output on standalone or manager nodes. applied on the system. The 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 EE platform customers, when you license UCP, this same license is applied to
engines in the cluster. Docker recommends platform customers use UCP to manage their license. the underlying 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 EE engines can be licensed using `docker engine activate`.
Offline activation of standalone EE engines can be performed by downloading the license and Offline activation of standalone EE engines can be performed by downloading the
using the command `docker engine activate --license filename.lic`. license and 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
This gives Enterprise users the ability to install as many CLI packages as needed package. This gives Enterprise users the ability to install as many CLI
without using the Engine node licenses for client-only systems. 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).
@ -91,22 +96,21 @@ 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
careful API backward compatibility and deprecate APIs and features slowly and maintain careful API backward compatibility and deprecate APIs and features
conservatively. We remove features after deprecating them for a period of slowly and conservatively. We remove features after deprecating them for a
three stable releases. Docker 1.13 introduced improved interoperability period of three stable releases. Docker 1.13 introduced improved
between clients and servers using different API versions, including dynamic interoperability between clients and servers using different API versions,
feature negotiation. including dynamic 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
with valid subscriptions whether the subscription covers Docker EE or customers with valid subscriptions whether the subscription covers Docker
Commercially Supported Docker. You can choose to stay with your current Enterprise or Commercially Supported Docker. You can choose to stay with your
deployed version, or you can upgrade to the latest Docker EE version. For current deployed version, or you can upgrade to the latest Docker Enterprise
more info, see [Scope of Coverage and Maintenance version. For 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).
## Where to go next ## Where to go next