From 67845656a35c56a9ee67a1cf7dd5dba90058b867 Mon Sep 17 00:00:00 2001
From: Anne Henmi <anne.henmi@docker.com>
Date: Thu, 4 Oct 2018 10:59:04 -0600
Subject: [PATCH] resolve merge conflict

---
 engine/cc-ee-node-activation.md | 103 ++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 engine/cc-ee-node-activation.md

diff --git a/engine/cc-ee-node-activation.md b/engine/cc-ee-node-activation.md
new file mode 100644
index 0000000000..dceb0eb4bc
--- /dev/null
+++ b/engine/cc-ee-node-activation.md
@@ -0,0 +1,103 @@
+---
+description: Engine
+keywords: Engine, CE, EE, node activate
+title: CE-EE Node Activate
+---
+
+The Docker Enterprise Engine for Docker `18.09` release introduces a new feature called CE-EE Node Activate, which allows a user to perform an in-place seamless activation of the EE feature-set on an existing CE node through the Docker Command Line Interface (CLI) without a re-install.
+
+CE-EE node activate will apply a license, and if you aren't already running the Enterprise engine, and switch the Docker engine to the enterprise engine binary.
+
+The Docker Commmunity Edition Engine for Docker version must be version `18.09` or higher.
+
+The activation can be performed either online with connection to Docker Hub, or offline.
+
+## Limitations
+
+* This feature is only supported on x86 Linux nodes
+* Windows nodes are not currently supported
+* Node level Engine activation between CE and EE is only supported in the same version of Docker Enterprise Engine for Docker
+* Prior version of the Docker Enterprise Engine for Docker to not support this feature
+
+## Docker Engine 18.09 CE to EE Node Activation Process
+
+1. Check the current Docker version.
+```
+root@docker-node:~# docker version
+Client:
+ Version:           18.09.0-ce
+ API version:       1.39
+ Go version:        go1.10.3
+ Git commit:        ca36ebe
+ Built:             Thu Aug 23 18:21:56 2018
+ OS/Arch:           linux/amd64
+ Experimental:      false
+Server:
+ Engine:
+  Version:          18.09.0-ce
+  API version:      1.39 (minimum version 1.12)
+  Go version:       go1.10.3
+  Git commit:       ca36ebe
+  Built:
+  OS/Arch:          linux/amd64
+  Experimental:     false
+```
+**NOTE**: Your output may vary slightly from what is displayed on this page.
+
+2. Log into the Docker engine from the command line.
+
+```
+root@docker-node:~# docker login
+Login with your Docker ID to push and pull images from Docker Hub. If you don't have a Docker ID, head over to https://hub.docker.com to create one.
+Username: beluga
+Password:
+WARNING! Your password will be stored unencrypted in /home/docker/.docker/config.json.
+Configure a credential helper to remove this warning. See
+https://docs.docker.com/engine/reference/commandline/login/#credentials-store
+Login Succeeded
+```
+
+3. Activate the EE license. You must use sudo even if your user is part of the docker group.
+
+```
+root@docker-node:~# sudo docker engine activate
+Looking for existing licenses for beluga...
+NUM                 OWNER               PRODUCT ID                     EXPIRES                         PRICING COMPONENTS
+0                   beluga          docker-ee-trial                2018-09-13 21:41:12 +0000 UTC   Nodes:10
+1                   beluga          docker-ee-trial                2018-08-31 03:17:15 +0000 UTC   Nodes:10
+```
+
+4. Pick the license of your choice
+```
+Please pick a license by number: 0
+waiting for engine to be responsive... engine is online.
+```
+
+5. Check the Docker Enterprise Engine for Docker version. The server engine will now be EE, and the client will stay CE.
+```
+
+root@docker-node:~# docker version
+Client:
+ Version:           18.09.0-ce
+ API version:       1.39
+ Go version:        go1.10.3
+ Git commit:        ca36ebe
+ Built:             Thu Aug 23 18:21:56 2018
+ OS/Arch:           linux/amd64
+ Experimental:      false
+Server:
+ Engine:
+  Version:          18.09.0-ee-1
+  API version:      1.39 (minimum version 1.12)
+  Go version:       go1.10.3
+  Git commit:       b9e7996
+  Built:
+  OS/Arch:          linux/amd64
+  Experimental:     false
+```
+
+**NOTE**: Your output may vary slightly from what is displayed on this page.
+
+## Off-line CE-EE node activation
+
+For offline CE-EE node activation, you'll need to get the enterprise engine onto the system. The recommended model is to download the EE deb or rpm packages manually and copy them to the target systems. Afterward, download the license manually, and copy that license to the target systems. Use the `--license` flag to the activate command.