Merge branch 'landing-page' of https://github.com/docker/docs-private into landing-pages

ee/index.md

@@ -1,17 +1,14 @@
 ---
+description: Home page for Docker Enterprise documentation
+keywords: Docker Enterprise, documentation, manual, guide, reference, api, CLI
 title: Docker Enterprise
-description: Learn about Docker Enterprise, the industry-leading container platform to securely build, share, and run any application, on any infrastructure.
-keywords: Docker EE, Docker Enterprise, UCP, DTR, orchestration, cluster, Kubernetes, CaaS
-redirect_from:
-  - /enterprise/
-  - /manuals/
 ---
 
+The Docker Enterprise platform business, including products, customers, and employees, has been acquired by Mirantis, inc., effective 13-November-2019. For more information on the acquisition and how it may affect you and your business, refer to the [Docker Enterprise Customer FAQ](https://www.docker.com/faq-for-docker-enterprise-customers-and-partners).
 
-The Docker Enterprise platform is the leading container platform for continuous, high-velocity innovation. Docker is the only independent container platform that enables developers to seamlessly build and share any application — from legacy to modern — and operators to securely run them anywhere - from hybrid cloud to the edge.
+## Docker Enterprise platform
 
-Docker Enterprise is a secure, scalable, and supported container platform for building and
+The Docker Enterprise platform is the leading container platform for continuous, high-velocity innovation. Docker Enterprise is the only independent container platform that enables developers to seamlessly build and share any application — from legacy to modern — and operators to securely run them anywhere - from hybrid cloud to the edge.
-orchestrating applications across multi-tenant Linux, Windows Server 2016, and Windows Server 2019.
 
 Docker Enterprise enables deploying highly available workloads using either the Docker Kubernetes Service or Docker Swarm. Docker Enterprise automates many of the tasks that orchestration requires, like provisioning pods, containers, and cluster
 resources. Self-healing components ensure that Docker Enterprise clusters remain highly available.
@@ -28,17 +25,9 @@ cluster and applications through a single interface.
 
 ![](images/docker-ee-overview-1.png){: .with-border}
 
-## Docker Enterprise features
-
-Docker Enterprise provides multi-architecture orchestration using the Docker Kubernetes Service and
-Docker Swarm orchestrators. Docker Enterprise enables a secure software supply chain, with policy-based image
-promotion, image mirroring between registries - including Docker Hub, and signing & scanning enforcement for container images.
-
 ### Docker Kubernetes Service
 
-The Docker Kubernetes Service fully supports all Docker Enterprise features, including
+The Docker Kubernetes Service fully supports all Docker Enterprise features, including role-based access control, LDAP/AD integration, image scanning and signing enforcement policies, and security policies.
-role-based access control, LDAP/AD integration, image scanning and signing enforcement policies,
-and security policies.
 
 Docker Kubernetes Services features include:
 
@@ -181,12 +170,3 @@ KubeDNS is running at https://54.200.115.43:6443/api/v1/namespaces/kube-system/s
 
 To further debug and diagnose cluster problems, use 'kubectl cluster-info dump'.
 ```
-
-## Docker Context
-A new Docker CLI plugin called `docker context` is available with client version 19.03.0. `docker context` helps manage connections to multiple environments so you do not have to remember and type out connection strings. [Read more](../engine/reference/commandline/context/) about `docker context`.
-
-
-## Where to go next
-
-- [Supported platforms](supported-platforms.md)
-- [Docker Enterprise architecture](docker-ee-architecture.md)

ee/overview.md

@@ -0,0 +1,168 @@
+---
+title: Docker Enterprise
+description: Learn about Docker Enterprise, the industry-leading container platform to securely build, share, and run any application, on any infrastructure.
+keywords: Docker Enterprise, UCP, DTR, orchestration, cluster, Kubernetes
+---
+
+The Docker Enterprise platform is the leading container platform for continuous, high-velocity innovation. Docker Enterprise is the only independent container platform that enables developers to seamlessly build and share any application — from legacy to modern — and operators to securely run them anywhere - from hybrid cloud to the edge.
+
+Docker Enterprise enables deploying highly available workloads using either the Docker Kubernetes Service or Docker Swarm. Docker Enterprise automates many of the tasks that orchestration requires, like provisioning pods, containers, and cluster
+resources. Self-healing components ensure that Docker Enterprise clusters remain highly available.
+
+Role-based access control (RBAC) applies to Kubernetes and Swarm orchestrators, and
+communication within the cluster is secured with TLS.
+[Docker Content Trust](/engine/security/trust/content_trust/) is enforced
+for images on all of the orchestrators.
+
+Docker Enterprise includes Docker Universal Control Plane (UCP), the
+cluster management solution from Docker. UCP can be installed
+on-premises or in your public cloud of choice, and helps manage your
+cluster and applications through a single interface.
+
+![](images/docker-ee-overview-1.png){: .with-border}
+
+### Docker Kubernetes Service
+
+The Docker Kubernetes Service fully supports all Docker Enterprise features, including role-based access control, LDAP/AD integration, image scanning and signing enforcement policies, and security policies.
+
+Docker Kubernetes Services features include:
+
+- Kubernetes orchestration full feature set
+- CNCF Certified Kubernetes conformance
+- Kubernetes app deployment via UCP web UI or CLI (`kubectl`)
+- Compose stack deployment for Swarm and Kubernetes apps (`docker stack deploy`)
+- Role-based access control for Kubernetes workloads
+- Blue-Green deployments, for load balancing to different app versions
+- Ingress Controllers with Kubernetes L7 routing
+- [Pod Security Policies](https://kubernetes.io/docs/concepts/policy/pod-security-policy/) to define a set of conditions that a pod must run with in order to be accepted into the system
+  - Note: Pod Security Policies are currently `Beta` status in Kubernetes 1.14
+- Container Storage Interface (CSI) support
+- iSCSI support for Kubernetes
+- Non-disruptive Docker Enterprise platform upgrades (blue-green upgrades)
+- Experimental features (planned for full GA in subsequent Docker Enterprise releases):
+  - Kubernetes-native ingress (Istio)
+
+In addition, UCP integrates with Kubernetes by using admission controllers,
+which enable:
+
+- Authenticating user client bundle certificates when communicating directly
+  with the Kubernetes API server
+- Authorizing requests via the UCP role-based access control model
+- Assigning nodes to a namespace by injecting a `NodeSelector` automatically
+  to workloads via admission control
+- Keeping all nodes in both Kubernetes and Swarm orchestrator inventories
+- Fine-grained access control and privilege escalation prevention without
+  the `PodSecurityPolicy` admission controller
+- Resolving images of deployed workloads automatically, and accepting or
+  rejecting images based on UCP's signing-policy feature
+
+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.
+
+### Orchestration platform features
+
+![](images/docker-ee-overview-4.png){: .with-border}
+
+- Docker Enterprise manager nodes are both Swarm managers and Kubernetes masters,
+  to enable high availability
+- Allocate worker nodes for Swarm or Kubernetes workloads (or both)
+- Single pane of glass for monitoring apps
+- Enhanced Swarm hostname routing mesh with Interlock 2.0
+- One platform-wide management plane: secure software supply chain, secure
+  multi-tenancy, and secure and highly available node management
+
+### Secure supply chain
+
+![](images/docker-ee-overview-3.png){: .with-border}
+
+- DTR support for the Docker App format, based on the [CNAB](https://cnab.io) specification
+  - Note: Docker Apps can be deployed to clusters managed by UCP, where they will be displayed as _Stacks_
+- Image signing and scanning of Kubernetes and Swarm images and Docker Apps for validating and verifying content
+- Image promotion with mirroring between registries as well as Docker Hub
+- Define policies for automating image promotions across the app development
+  lifecycle of Kubernetes and Swarm apps
+
+### Centralized cluster management
+
+With Docker, you can join thousands of physical or virtual machines
+together to create a cluster, allowing you to deploy your
+applications at scale. Docker Enterprise extends the functionality provided by Docker
+Engine to make it easier to manage your cluster from a centralized place.
+
+You can manage and monitor your container cluster using a graphical web interface.
+
+### Deploy, manage, and monitor
+
+With Docker Enterprise, you can manage all of the infrastructure
+resources you have available, like nodes, volumes, and networks, from a central console.
+
+You can also deploy and monitor your applications and services.
+
+### Built-in security and access control
+
+Docker Enterprise has its own built-in authentication mechanism with role-based access
+control (RBAC), so that you can control who can access and make changes to your
+cluster and applications. Also, Docker Enterprise authentication integrates with LDAP
+services and supports SAML SCIM to proactively synchronize with authentication providers.
+[Learn about role-based access control](./ucp/authorization/). You can also opt to enable [PKI authentication](./enable-client-certificate-authentication/) to use client certificates, rather than username and password.
+
+![](images/docker-ee-overview-2.png){: .with-border}
+
+Docker Enterprise integrates with Docker Trusted Registry so that you can keep the
+Docker images you use for your applications behind your firewall, where they
+are safe and can't be tampered with. You can also enforce security policies and only allow running applications
+that use Docker images you know and trust.
+
+#### Windows Application Security
+Windows applications typically require Active Directory authentication in order to communicate with other services on the network. Container-based applications use Group Managed Service Accounts (gMSA) to provide this authentication. Docker Swarm fully supports the use of gMSAs with Windows containers.
+
+
+## Docker Enterprise and the CLI
+
+Docker Enterprise exposes the standard Docker API, so you can continue using the tools
+that you already know, [including the Docker CLI client](./ucp/user-access/cli/),
+to deploy and manage your applications.
+
+For example, you can use the `docker info` command to check the
+status of a Swarm managed by Docker Enterprise:
+
+```bash
+docker info
+```
+
+Which produces output similar to the following:
+
+```bash
+Containers: 38
+Running: 23
+Paused: 0
+Stopped: 15
+Images: 17
+Server Version: 17.06
+...
+Swarm: active
+NodeID: ocpv7el0uz8g9q7dmw8ay4yps
+Is Manager: true
+ClusterID: tylpv1kxjtgoik2jnrg8pvkg6
+Managers: 1
+…
+```
+
+## Use the Kubernetes CLI
+
+Docker Enterprise exposes the standard Kubernetes API, so you can use [kubectl
+to manage your Kubernetes workloads](./ucp/user-access/cli/):
+
+```bash
+kubectl cluster-info
+```
+
+Which produces output similar to the following:
+
+```bash
+Kubernetes master is running at https://54.200.115.43:6443
+KubeDNS is running at https://54.200.115.43:6443/api/v1/namespaces/kube-system/services/kube-dns:dns/proxy
+
+To further debug and diagnose cluster problems, use 'kubectl cluster-info dump'.
+```

ee/release-notes.md

@@ -1,35 +1,10 @@
 ---
-title: Docker Enterprise release notes
+title: Install or upgrade Docker Enterprise components
 description: Learn about the new features, bug fixes, and breaking changes for Docker Enterprise.
 keywords: engine enterprise, ucp, dtr, desktop enterprise, whats new, release notes
 ---
 
-This page provides information about Docker Enterprise 3.0. For 
+This page provides information about Docker Enterprise 3.0. For detailed information about for each enterprise component, refer to the individual component release notes below.
-detailed information about for each enterprise component, refer to the individual component release notes 
-pages listed in the following **Docker Enterprise components install and upgrade** section.
-
-## What’s New?
-
-| Feature | Component | Component version |
-|---------|-----------|-------------------|
-| [Group Managed Service Accounts (gMSA)](/engine/swarm/services.md#gmsa-for-swarm) | UCP | 3.2.0 |
-| [Open Security Controls Assessment Language (OSCAL)](/compliance/oscal/) | UCP | 3.2.0 |
-| [Container storage interface (CSI)](/ee/ucp/kubernetes/storage/use-csi/) | UCP | 3.2.0 |
-| [Internet Small Computer System Interface (iSCSI)](/ee/ucp/kubernetes/storage/use-iscsi/) | UCP | 3.2.0 |
-| [System for Cross-domain Identity Management (SCIM)](/ee/ucp/admin/configure/integrate-scim/) | UCP | 3.2.0 |
-| [Pod Security Policies](/ee/ucp/kubernetes/pod-security-policies/) | UCP | 3.2.0 |
-| [Docker Registry CLI (Experimental)](/engine/reference/commandline/registry/) | DTR | 2.7.0 |
-| [App Distribution](/ee/dtr/user/manage-applications/) | DTR | 2.7.0 |
-| [Client certificate-based Authentication](/ee/enable-client-certificate-authentication/) | DTR and UCP|2.7.0 (DTR) and 3.2.0 (UCP)|
-| [Application Designer](/ee/desktop/app-designer/) | Docker Desktop Enterprise | 0.1.4  |
-| [Docker App (Experimental)](/app/working-with-app/) |CLI | 0.8.0 |
-| [Docker Assemble (Experimental)](/assemble/install/) | CLI | 0.36.0 |
-| [Docker Buildx (Experimental)](/buildx/working-with-buildx/)| CLI | 0.2.2 |
-| [Docker Cluster](/cluster/) | CLI | 1.0.0 |
-| [Docker Template CLI (Experimental)](/app-template/working-with-template/) | CLI | 0.1.4 |
-
-
-## Docker Enterprise components install and upgrade
 
 | Component Release Notes | Version | Install | Upgrade |
 |---------|-----------|-------------------|-------------- |
@@ -39,7 +14,3 @@ pages listed in the following **Docker Enterprise components install and upgrade
 | [Docker Desktop Enterprise](/ee/desktop/release-notes/) | 2.1.0 |Install Docker Desktop Enterprise [Mac](/ee/desktop/admin/install/mac/), [Windows](/ee/desktop/admin/install/windows/) | Upgrade Docker Desktop Enterprise  [Mac](/ee/desktop/admin/install/mac/), [Windows](/ee/desktop/admin/install/windows/) |
 
 Refer to the [Compatibility Matrix](https://success.docker.com/article/compatibility-matrix) and the [Maintenance Lifecycle](https://success.docker.com/article/maintenance-lifecycle) for compatibility and software maintenance details.
-
- 
- 
-

get-started/index.md

@@ -57,7 +57,7 @@ redirect_from:
 
 {% include_relative nav.html selected="1" %}
 
-Welcome! We are excited that you want to learn Docker. The _Docker Get Started Tutorial_
+Welcome! We are excited that you want to learn Docker. The _Docker Community QuickStart_
 teaches you how to:
 
 1. Set up your Docker environment (on this page)

index.md

@@ -2,48 +2,24 @@
 description: Home page for Docker's documentation
 keywords: Docker, documentation, manual, guide, reference, api, samples
 landing: true
-title: Docker Documentation
-notoc: true
-notags: true
 skip_read_time: true
 ---
-{% assign page.title = site.name %}
 
 <div class="row">
 <div markdown="1" class="col-xs-12 col-sm-12 col-md-12 col-lg-6 block">
 
-## Get started with Docker
+## Docker Quickstart
 
-Try our multi-part walkthrough that covers writing your first app,
+Try our multi-part Quickstart that covers building an image, using kubernetes and swarm on your development machine, and sharing your containerized applications on [Docker Hub](http://hub.docker.com). Total reading time is less than an hour.
-data storage, networking, and swarms, and ends with your app running on
-production servers in the cloud. Total reading time is less than an hour.
 
 [Get started with Docker](/get-started/){: class="button outline-btn"}
 
 </div>
 <div markdown="1" class="col-xs-12 col-sm-12 col-md-12 col-lg-6 block">
 
-## Try Docker Enterprise
+## Docker Engine - Community
 
-Run your solution in production with Docker Enterprise to get a
+Docker Engine - Community is available on many platforms, from desktop to cloud to server. Build and share
-management dashboard, security scanning, LDAP integration, content signing,
-multi-cloud support, and more. Click below to test-drive a running instance of
-Docker Enterprise without installing anything.
-
-[Try Docker Enterprise](https://trial.docker.com){: class="button outline-btn" onclick="ga('send', 'event', 'EE Trial Referral', 'Front Page', 'Click');"}
-
-</div>
-</div>
-
-## Docker products
-
-<div class="row">
-<div markdown="1" class="col-xs-12 col-sm-12 col-md-12 col-lg-6 block">
-
-### Docker Engine - Community
-
-Get started with Docker and experimenting with container-based apps. Docker Engine - Community
-is available on many platforms, from desktop to cloud to server. Build and share
 containers and automate the development pipeline from a single environment.
 Choose the Edge channel to get access to the latest features, or the Stable
 channel for more predictability.
@@ -51,29 +27,14 @@ channel for more predictability.
 [Learn more about Docker Engine - Community](/install/){: class="button outline-btn"}
 
 </div>
-<div markdown="1" class="col-xs-12 col-sm-12 col-md-12 col-lg-6 block">
-
-### Docker Enterprise
-
-Designed for enterprise development and IT teams who build, ship, and run
-business critical applications in production at scale. Integrated, certified,
-and supported to provide enterprises with the most secure container platform in
-the industry to modernize all applications. Docker Enterprise comes with enterprise
-[add-ons](#docker-ee-add-ons) like Universal Control Plane (UCP) for managing and
-orchestrating the container runtime, and Docker Trusted Registry (DTR) for storing and
-securing images in an enterprise grade registry.
-
-[Learn more about Docker Enterprise products](/ee/supported-platforms/){: class="button outline-btn"}
-
 </div>
-</div><!-- end row -->
 
-## Run Docker anywhere
+## Docker Desktop
 
 <div class="component-container">
     <!--start row-->
     <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-4 block">
+        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-6 block">
             <div class="component">
                 <div class="component-icon">
                     <a href="docker-for-mac/"> <img src="../images/apple_48.svg" alt="Docker Desktop for Mac"> </a>
@@ -82,7 +43,7 @@ securing images in an enterprise grade registry.
                 <p>A native application using the macOS sandbox security model which delivers all Docker tools to your Mac.</p>
             </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-4 block">
+        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-6 block">
             <div class="component">
                 <div class="component-icon">
                     <a href="docker-for-windows/"> <img src="../images/windows_48.svg" alt="Docker Desktop for Windows"> </a>
@@ -91,14 +52,11 @@ securing images in an enterprise grade registry.
                 <p>A native Windows application which delivers all Docker tools to your Windows computer.</p>
             </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-4 block">
-            <div class="component">
-                <div class="component-icon">
-                    <a href="install/linux/ubuntu/"> <img src="../images/linux_48.svg" alt="Docker for Linux"> </a>
-                </div>
-                <h3 id="docker-for-linux"><a href="install/linux/ubuntu/">Docker for Linux</a></h3>
-                <p>Install Docker on a computer which already has a Linux distribution installed.</p>
-            </div>
-        </div>
     </div>
 </div>
+
+### Docker Enterprise
+
+TThe Docker Enterprise platform business, including products, customers, and employees, has been acquired by Mirantis, inc., effective 13-November-2019. For more information on the acquisition and how it may affect you and your business, refer to the [Docker Enterprise Customer FAQ](https://www.docker.com/faq-for-docker-enterprise-customers-and-partners).
+
+For Docker Enterprise documentation, see the [Docker Enterprise](/ee/) tab.

install/index.md

@@ -1,5 +1,5 @@
 ---
-title: About Docker Engine - Community
+title: Docker Engine - Community
 description: Lists the installation methods
 keywords: docker, installation, install, Docker Engine - Community, Docker Engine - Enterprise, docker editions, stable, edge
 redirect_from:
@@ -29,7 +29,7 @@ apps. Docker Engine - Community has three types of update channels, **stable**,
 
 ## Releases
 
-For the Docker Engine - Community engine, the open
+For the Docker Engine - Community, the open
 repositories [Docker Engine](https://github.com/docker/engine) and
 [Docker Client](https://github.com/docker/cli) apply.
 
@@ -97,14 +97,6 @@ Binaries built from this releases are available in the stable channel
 `stable-YY.mm`, for example `stable-18.09`, as well as the corresponding
 test channel.
 
-### Relationship between Docker Engine - Community and Docker Engine - Enterprise code
-
-For a given year-month release, Docker releases both Docker Engine - Community and Docker Engine - Enterprise variants concurrently. Docker Engine - Enterprise is a superset of the code delivered in Docker Engine - Community. Docker maintains publicly visible repositories for the Docker Engine - Community code
-as well as private repositories for the Docker Engine - Enterprise code. Automation (a bot) is used to keep the branches between Docker Engine - Community and Docker Engine - Enterprise in sync so as features
-and fixes are merged on the various branches in the Docker Engine - Community repositories (upstream), the corresponding Docker Engine - Enterprise repositories and branches are kept
-in sync (downstream). While Docker and its partners make every effort
-to minimize merge conflicts between Docker Engine - Community and Docker Engine - Enterprise, occasionally they will happen, and Docker will work hard to resolve them in a timely fashion.
-
 ## Next release
 
 The activity for upcoming year-month releases is tracked in the milestones

manuals/index.md

@@ -0,0 +1,7 @@
+---
+title: Product Manuals
+description: Learn about Docker Engine - Community
+keywords: Docker Engine - Community, Docker Community
+---
+
+Landing page for the Docker Community product manuals

thank-you-subscribing-docker-weekly.md

@@ -1,9 +0,0 @@
----
-description: We've sent you a welcome email with links to previous newsletters.
-keywords: Docker, documentation, manual, guide, reference, api
-title: Thank you for subscribing to Docker weekly
-skip_read_time: true
----
-
-We've sent you a welcome email with links to previous newsletters.
-Check your inbox to confirm you received it.