From 5e69d63a4448c575968af68460cd290d21ed2755 Mon Sep 17 00:00:00 2001 From: Anne Henmi Date: Tue, 27 Nov 2018 20:13:52 -0700 Subject: [PATCH 1/4] Initial draft. --- ee/supported-platforms.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ee/supported-platforms.md b/ee/supported-platforms.md index 605cbf3b20..c8e29aa709 100644 --- a/ee/supported-platforms.md +++ b/ee/supported-platforms.md @@ -40,6 +40,17 @@ 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. +In 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 stand-alone 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. + +For stand-alone EE engines, they can be licensed using `docker engine activate`. + +Offline activation of stand-alone EE engines can be performed by downloading the license and +using the command `docker engine activate .--license filename.lic`. + [Learn more about Docker Enterprise](/ee/index.md). From 4d48ab08e37ced8fbfc59f9ee72058bf049a6b44 Mon Sep 17 00:00:00 2001 From: Anne Henmi Date: Thu, 29 Nov 2018 21:06:58 -0700 Subject: [PATCH 2/4] Added in content for https://github.com/docker/docs-private/issues/896 --- ee/supported-platforms.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ee/supported-platforms.md b/ee/supported-platforms.md index c8e29aa709..2a4d044c28 100644 --- a/ee/supported-platforms.md +++ b/ee/supported-platforms.md @@ -40,6 +40,8 @@ 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 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 stand-alone or manager nodes. @@ -51,6 +53,10 @@ For stand-alone EE engines, they can be licensed using `docker engine activate`. Offline activation of stand-alone 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 an installation package that can be separately +from the Docker Engine - Enterprise. This now gives the 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). From 3d1312b25797609a008c3225d1dd83e81258ba0a Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Tue, 4 Dec 2018 13:05:00 -0700 Subject: [PATCH 3/4] Update supported-platforms.md Technical review complete by @andrewhsu --- ee/supported-platforms.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ee/supported-platforms.md b/ee/supported-platforms.md index 2a4d044c28..9ffa32a509 100644 --- a/ee/supported-platforms.md +++ b/ee/supported-platforms.md @@ -51,11 +51,11 @@ engines in the cluster. Docker recommends platform customers use UCP to manage t For stand-alone EE engines, they can be licensed using `docker engine activate`. Offline activation of stand-alone EE engines 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 an installation package that can be separately -from the Docker Engine - Enterprise. This now gives the Enterprise users the ability to install as -many CLI packages as needed without using the Engine node licenses for client-only systems. +Additionally, Docker is now distributing the CLI as a separate installation package. +This gives the 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). From 903b7cca1c793b6c65e108f96beb31d018f687c9 Mon Sep 17 00:00:00 2001 From: L-Hudson <44844738+L-Hudson@users.noreply.github.com> Date: Fri, 7 Dec 2018 09:40:14 -0500 Subject: [PATCH 4/4] Update supported-platforms.md minor edits --- ee/supported-platforms.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ee/supported-platforms.md b/ee/supported-platforms.md index 9ffa32a509..50bcfc1c2d 100644 --- a/ee/supported-platforms.md +++ b/ee/supported-platforms.md @@ -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 @@ -42,19 +42,19 @@ maintenance cycles for patches for up to 24 months. ### New Licensing for Docker Enterprise -In 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 stand-alone or manager nodes. +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. -For stand-alone EE engines, they can be licensed using `docker engine activate`. +Standalone EE engines can be licensed using `docker engine activate`. -Offline activation of stand-alone EE engines can be performed by downloading the license and +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 the Enterprise users the ability to install as many CLI packages as needed +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).