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

Merge pull request #897 from docker/licensing-enterprise-engine-894 

Added updates to how the underlying licensing works
This commit is contained in:
Anne Henmi 2018-12-07 10:16:56 -07:00 committed by GitHub
parent 14f78649ab 903b7cca1c
commit d6fa1af51a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ee/supported-platforms.md
View File

@ -25,14 +25,14 @@ options, see [Docker Enterprise](https://www.docker.com/enterprise-edition/).
> Note
>
> Starting with Docker Enterprise 2.1, Docker Enterprise - Basic, Docker Enterprise - Standard,
> and Docker Enterprise - Advanced are all now called Docker Enterprise.
> Starting with Docker Enterprise 2.1, Docker Enterprise --- Basic, Docker Enterprise --- Standard,
> and Docker Enterprise --- Advanced are all now called Docker Enterprise.
### Docker 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
on Windows, Linux, on-premise 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
management with support for Kubernetes and Swarm orchestrators. It allows you to implement
@ -40,6 +40,23 @@ node-based RBAC policies, image promotion policies, image mirroring, and
scan your images for vulnerabilities. It also has support with defined SLAs and extended
maintenance cycles for patches for up to 24 months.
### New Licensing for Docker Enterprise
In version 18.09, the Docker Enterprise --- Engine is aware of the license 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
engines in the cluster. Docker recommends platform customers use UCP to manage their license.
Standalone EE engines can be licensed using `docker engine activate`.
Offline activation of standalone EE engines can be performed by downloading the license and
using the command `docker engine activate --license filename.lic`.
Additionally, Docker is now distributing the CLI as a separate installation package.
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).