Merge pull request #1193 from docker/issue-1170

removing references to IBM
This commit is contained in:
David Yu 2019-06-12 18:39:08 -07:00 committed by GitHub
commit 977325e6ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 11 deletions

View File

@ -1,7 +1,7 @@
---
title: Docker Enterprise
description: Learn about Docker Enterprise Edition, the enterprise-grade cluster management solution from Docker.
keywords: Docker EE, UCP, DTR, orchestration, cluster, Kubernetes
description: Learn about Docker Enterprise, the enterprise-grade cluster management solution from Docker.
keywords: Docker Enterprise, UCP, DTR, orchestration, cluster, Kubernetes
redirect_from:
- /enterprise/
- /manuals/
@ -12,8 +12,7 @@ chain and deploys diverse applications for high availability across disparate
infrastructure, both on-premises and in the cloud.
Docker Enterprise is a secure, scalable, and supported container
platform for building and orchestrating applications across multi-tenant Linux,
Windows Server 2016, and IBM Z environments.
platform for building and orchestrating applications across multi-tenant Linux, and Windows Server 2016.
Docker Enterprise enables deploying your workloads for high availability (HA) onto the
orchestrator of your choice. Docker Enterprise automates many of the tasks that
@ -74,13 +73,6 @@ The default Docker Enterprise installation includes both Kubernetes and Swarm
components across the cluster, so every newly joined worker node is ready
to schedule Kubernetes or Swarm workloads.
> IBM z Systems
>
> Kubernetes workloads aren't supported on IBM z Systems clusters. On a mixed
> cluster with z Systems, Docker Engine - Enterprise won't schedule Kubernetes workloads
> on z Systems nodes.
{: .important}
### Orchestration platform features
![](images/docker-ee-overview-4.svg){: .with-border}