diff --git a/_data/toc.yaml b/_data/toc.yaml
index e1e923e3e2..77409de421 100644
--- a/_data/toc.yaml
+++ b/_data/toc.yaml
@@ -352,12 +352,10 @@ guides:
section:
- path: /deploy/
title: Docker Enterprise Edition
- - path: /deploy/deploy-kubernetes-workload/
- title: Deploy a workload to a Kubernetes cluster
- sectiontitle: Architecture
section:
- - path: /deploy/architecture/how-docker-ee-delivers-ha/
- title: How Docker EE delivers high availability for your workloads
+ - path: /deploy/architecture/docker-ee-architecture/
+ title: Docker EE architecture
- path: /deploy/architecture/dtr-architecture/
title: DTR architecture
- path: /deploy/architecture/ucp-architecture/
diff --git a/deploy/architecture/how-docker-ee-delivers-ha.md b/deploy/architecture/docker-ee-architecture.md
similarity index 53%
rename from deploy/architecture/how-docker-ee-delivers-ha.md
rename to deploy/architecture/docker-ee-architecture.md
index 257b7a731a..f5e30fd065 100644
--- a/deploy/architecture/how-docker-ee-delivers-ha.md
+++ b/deploy/architecture/docker-ee-architecture.md
@@ -1,8 +1,8 @@
---
-title: How Docker EE delivers high availability for your workloads
+title: Docker EE architecture
description: |
- Learn about the architecture of Docker Enterprise Edition and how it enables deploying workloads for HA.
-keywords: UCP, Docker EE, orchestration, Kubernetes, cluster, architecture, high availability
+ Learn about the architecture of Docker Enterprise Edition and how it delivers high availability for your workloads.
+keywords: Docker EE, UCP, DTR, architecture, orchestration, Kubernetes, Swarm, cluster, high availability
next_steps:
- path: ucp-architecture
title: UCP architecture
@@ -12,7 +12,7 @@ next_steps:
Docker Enterprise Edition (EE) enables deploying your workloads for high
availability (HA) onto the orchestrator of your choice. Docker EE system
-components run on multiple manager nodes in the cluster, and if one manager
+components can run on multiple manager nodes in the cluster, and if one manager
node fails, another takes its place automatically, without impact to the
cluster.
@@ -20,46 +20,52 @@ cluster.
Docker EE provides access to the full API sets of three popular orchestrators:
-- Kubernetes
-- SwarmKit (Compose file version 3)
-- "Classic" Swarm (Compose file version 2)
+- Kubernetes: Full YAML object support
+- SwarmKit: Service-centric, Compose file version 3
+- "Classic" Swarm: Container-centric, Compose file version 2
-{: .with-border}
+{: .with-border}
Docker EE proxies the underlying API of each orchestrator, giving you access
to all of the capabilities of each orchestrator, along with the benefits of
-Docker EE, like role-baseed access control and Docker Content Trust.
+Docker EE, like role-based access control and Docker Content Trust.
## Docker EE components
Docker EE has three major components, which together enable a full software
-supply chain, from image creation, to image storage, to image deployment.
+supply chain, from image creation, to secure image storage, to secure image
+deployment.
-- Docker EE Engine: The commercially supported Docker engine for creating
+- **Docker EE Engine**: The commercially supported Docker engine for creating
images and running them in Docker containers.
-- Docker Trusted Registry (DTR): The production-grade image storage solution
+
+- **Docker Trusted Registry (DTR)**: The production-grade image storage solution
from Docker.
-- Universal Control Plane (UCP): Deploys high-availability applications from
- images by managing orchestrators, like Kubernetes and Swarm.
+
+ DTR is designed to scale horizontally as your usage increases.
+ You can add more replicas to make DTR scale to your demand and for high
+ availability.
+
+ All DTR replicas run the same set of services, and changes to
+ their configuration are propagated automatically to other replicas.
-Docker Universal Control Plane is designed for high availability (HA). You can
-join multiple UCP manager nodes to the cluster, and if one manager node fails,
-another takes its place automatically without impact to the cluster. Changes to
-the configuration of one UCP manager node are propagated automatically to other
-nodes.
-
-Docker Trusted Registry is designed to scale horizontally as your usage
-increases. You can add more replicas to make DTR scale to your demand and for
-high availability. All DTR replicas run the same set of services, and changes
-to their configuration are propagated automatically to other replicas.
+- **Universal Control Plane (UCP)**: Deploys applications from images, by
+ managing orchestrators, like Kubernetes and Swarm.
+
+ UCP is designed for high availability (HA). You can join multiple UCP manager
+ nodes to the cluster, and if one manager node fails, another takes its place
+ automatically without impact to the cluster.
+
+ Changes to the configuration of one UCP manager node are propagated
+ automatically to other nodes.
{: .with-border}
### Universal Control Plane (UCP)
-Universal Control Plane (UCP) is a containerized application that runs on
-[Docker EE Engine](../index.md) and extends its functionality to make it
-easier to deploy, configure, and monitor your applications at scale.
+Docker UCP is a containerized application that runs on [Docker EE Engine](../index.md)
+and extends its functionality to make it easier to deploy, configure, and
+monitor your applications at scale.
Docker UCP provides a web UI and a CLI for deploying images from Kubernetes
YAML or Compose files. Once your workload is deployed, UCP enables monitoring
@@ -72,9 +78,9 @@ users can make changes and deploy applications to your cluster.
Once a UCP instance is deployed, you don't interact with Docker EE Engine
directly. Instead, you interact with UCP. Since UCP exposes the standard
-Docker API and the full Kubernetes API, and this is all done transparently,
-so that you can use the tools you already know and love, like `kubectl`,
-the Docker CLI client, and Docker Compose.
+Docker API and the full Kubernetes API transparently, you can use the tools
+you already know and love, like `kubectl`, the Docker CLI client, and Docker
+Compose.
[Learn about UCP architecture](ucp-architecture.md).
{: .with-border}
@@ -82,7 +88,7 @@ the Docker CLI client, and Docker Compose.
### Docker Trusted Registry (DTR)
Docker Trusted Registry (DTR) is a containerized application that runs on a
-Docker Universal Control Plane cluster.
+Docker UCP cluster.
{: .with-border}
diff --git a/deploy/images/how-docker-ee-delivers-ha-1.svg b/deploy/images/docker-ee-architecture-1.svg
similarity index 100%
rename from deploy/images/how-docker-ee-delivers-ha-1.svg
rename to deploy/images/docker-ee-architecture-1.svg
diff --git a/deploy/images/docker-ee-overview-3.svg b/deploy/images/docker-ee-overview-3.svg
new file mode 100644
index 0000000000..62e4b1ddc1
--- /dev/null
+++ b/deploy/images/docker-ee-overview-3.svg
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/deploy/images/docker-ee-overview-4.svg b/deploy/images/docker-ee-overview-4.svg
new file mode 100644
index 0000000000..17ad56e60c
--- /dev/null
+++ b/deploy/images/docker-ee-overview-4.svg
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/deploy/images/dtr-architecture-1.svg b/deploy/images/dtr-architecture-1.svg
index 2543230711..4ba36df942 100644
--- a/deploy/images/dtr-architecture-1.svg
+++ b/deploy/images/dtr-architecture-1.svg
@@ -31,7 +31,7 @@
- Docker Engine EE
+ Docker EE Engine
diff --git a/deploy/images/dtr-architecture-2.svg b/deploy/images/dtr-architecture-2.svg
index c75df0b051..0f9242ac2b 100644
--- a/deploy/images/dtr-architecture-2.svg
+++ b/deploy/images/dtr-architecture-2.svg
@@ -23,7 +23,7 @@
- Docker Engine EE
+ Docker EE Engine
@@ -46,7 +46,7 @@
- Docker Engine EE
+ Docker EE Engine
@@ -71,7 +71,7 @@
- Docker Engine EE
+ Docker EE Engine
@@ -100,7 +100,7 @@
- Docker Engine EE
+ Docker EE Engine
@@ -129,7 +129,7 @@
- Docker Engine EE
+ Docker EE Engine
@@ -160,7 +160,7 @@
- Docker Engine EE
+ Docker EE Engine
@@ -183,7 +183,7 @@
- Docker Engine EE
+ Docker EE Engine
@@ -206,7 +206,7 @@
- Docker Engine EE
+ Docker EE Engine
diff --git a/deploy/images/ucp-architecture-1.svg b/deploy/images/ucp-architecture-1.svg
index fc81f2e934..abd4a32d15 100644
--- a/deploy/images/ucp-architecture-1.svg
+++ b/deploy/images/ucp-architecture-1.svg
@@ -31,7 +31,7 @@
- Docker EE
+ Docker EE Engine
diff --git a/deploy/index.md b/deploy/index.md
index 3470eead74..daea5e0f96 100644
--- a/deploy/index.md
+++ b/deploy/index.md
@@ -64,7 +64,7 @@ Kubernetes in Docker EE fully supports all Docker EE features, including
role-based access control, LDAP/AD integration, scanning, signing enforcement,
and security policies.
-- Kubernetes orchestration features
+- Kubernetes orchestration full feature set
- CNCF Certified Kubernetes conformance
- Deploy Kubernetes apps via web UI or CLI
- Compose Stack deploy for both Swarm and Kubernetes apps
@@ -80,6 +80,8 @@ and security policies.
### Orchestration platform
+{: .with-border}
+
- Docker EE Manager Nodes are both Swarm managers and Kubernetes masters to enable
high availability
- Allocate nodes for Swarm and Kubernetes workloads
@@ -90,8 +92,12 @@ and security policies.
### Secure supply chain
-- Image promotion with mirroring between registries
-- Signing/scanning enforcement for Kubernetes
+{: .with-border}
+
+- Image signing and scanning of Kubernetes apps for validating and verifying content
+- Image promotion with mirroring between registries (not in Beta1)
+- Define policies for automating image promotions across the app development
+ lifecycle of Kubernetes apps (not in Beta1)
## Centralized cluster management