From b2440f49ac98294c2639fdead8c302b3e61a6907 Mon Sep 17 00:00:00 2001 From: Dawn W Docker Date: Wed, 11 Dec 2019 20:42:19 -0800 Subject: [PATCH 01/10] adding entry for index.md under enterprise tab --- _data/toc.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_data/toc.yaml b/_data/toc.yaml index 1995d310db..b1cd7804fc 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1692,6 +1692,8 @@ manuals: enterprise: - sectiontitle: Docker Enterprise section: + - path: /ee/ + title: Docker Enterprise - path: /ee/overview/ title: Overview - path: /ee/release-notes/ From 7a1a6f672ed583f6234edb413ee44f8c1a939bd8 Mon Sep 17 00:00:00 2001 From: Dawn W Docker Date: Thu, 12 Dec 2019 11:00:11 -0800 Subject: [PATCH 02/10] removing overview page for EE from toc, file still there --- _data/toc.yaml | 2 - ee/index.md | 169 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 167 insertions(+), 4 deletions(-) diff --git a/_data/toc.yaml b/_data/toc.yaml index b1cd7804fc..45df5b43cd 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1694,8 +1694,6 @@ enterprise: section: - path: /ee/ title: Docker Enterprise - - path: /ee/overview/ - title: Overview - path: /ee/release-notes/ title: Release notes - path: /ee/licensing/ diff --git a/ee/index.md b/ee/index.md index 91e1560fbc..34f09b90b9 100644 --- a/ee/index.md +++ b/ee/index.md @@ -5,7 +5,172 @@ landing: true skip_read_time: true title: "Docker Enterprise" --- - +*note* The Docker Enterprise platform business, including products, customers, and employees, has been acquired by Mirantis, inc., effective 13-November-2019. Among the Docker Enterprise platform technology and associated IP procured by Mirantis are Docker Engine - Enterprise, Docker Trusted Registry, Docker Universal Control Plane, and parts of the Docker CLI. -As part of Mirantis, the Enterprise team will continue to develop and support the Docker Enterprise platform. 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). \ No newline at end of file +As part of Mirantis, the Enterprise team will continue to develop and support the Docker Enterprise platform. 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). + +## Docker Enterprise platform + +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'. +``` From 1893cebaa20454712da4fc1ca4009f94a55e710c Mon Sep 17 00:00:00 2001 From: Dawn W Docker Date: Thu, 12 Dec 2019 14:29:31 -0800 Subject: [PATCH 03/10] removed compat topics under Get Docker and also moved install topic to manuals --- _data/toc.yaml | 16 +--------------- index.md | 6 ++---- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/_data/toc.yaml b/_data/toc.yaml index 45df5b43cd..5c5a9a1c56 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -4,7 +4,7 @@ horizontalnav: path: / node: guides - title: Product manuals - path: /manuals/ + path: /install/ node: manuals - title: Glossary path: /glossary/ @@ -24,8 +24,6 @@ guides: section: - sectiontitle: Docker Engine - Community section: - - title: Docker Engine - Community - path: /install/ - sectiontitle: Cloud section: - sectiontitle: Docker for AWS @@ -88,18 +86,6 @@ guides: title: Binaries - path: /install/linux/linux-postinstall/ title: Optional Linux post-installation steps - - sectiontitle: Compatibility between Docker versions - section: - - path: /engine/ce-ee-node-activate/ - title: Docker Engine Community to Enterprise Node Activate - - path: /engine/migration/ - title: Migrate to Docker 1.10 - - path: /engine/breaking_changes/ - title: Breaking changes - - path: /engine/deprecated/ - title: Deprecated Docker features - - path: /engine/faq/ - title: FAQ - sectiontitle: Get started section: - path: /engine/docker-overview/ diff --git a/index.md b/index.md index 64feedebbc..a464e4b082 100644 --- a/index.md +++ b/index.md @@ -55,10 +55,8 @@ channel for more predictability. -## Docker Enterprise +### Docker Enterprise -The Docker Enterprise platform business, including products, customers, and employees, has been acquired by Mirantis, inc., effective 13-November-2019. Among the Docker Enterprise platform technology and associated IP procured by Mirantis are Docker Engine - Enterprise, Docker Trusted Registry, Docker Universal Control Plane, and parts of the Docker CLI. - -As part of Mirantis, the Enterprise team will continue to develop and support the Docker Enterprise platform. 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). +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. \ No newline at end of file From 064ed3372f9e1cdc9230b1dff3098c0bd7739733 Mon Sep 17 00:00:00 2001 From: Dawn W Docker Date: Thu, 12 Dec 2019 14:33:54 -0800 Subject: [PATCH 04/10] enterprise index is too wide, adjusting metadata --- ee/index.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ee/index.md b/ee/index.md index 34f09b90b9..a63b98613f 100644 --- a/ee/index.md +++ b/ee/index.md @@ -1,11 +1,9 @@ --- description: Home page for Docker Enterprise documentation keywords: Docker Enterprise, documentation, manual, guide, reference, api, CLI -landing: true -skip_read_time: true -title: "Docker Enterprise" +title: Docker Enterprise --- -*note* + The Docker Enterprise platform business, including products, customers, and employees, has been acquired by Mirantis, inc., effective 13-November-2019. Among the Docker Enterprise platform technology and associated IP procured by Mirantis are Docker Engine - Enterprise, Docker Trusted Registry, Docker Universal Control Plane, and parts of the Docker CLI. As part of Mirantis, the Enterprise team will continue to develop and support the Docker Enterprise platform. 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). From 17b4dc3d25351dff0fb1ad2bb24f66322f1e4bac Mon Sep 17 00:00:00 2001 From: Dawn W Docker Date: Thu, 12 Dec 2019 14:48:58 -0800 Subject: [PATCH 05/10] redoing install page for enterprise --- _data/toc.yaml | 2 +- ee/index.md | 4 +--- ee/release-notes.md | 33 +++------------------------------ 3 files changed, 5 insertions(+), 34 deletions(-) diff --git a/_data/toc.yaml b/_data/toc.yaml index 5c5a9a1c56..e07f19a381 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1681,7 +1681,7 @@ enterprise: - path: /ee/ title: Docker Enterprise - path: /ee/release-notes/ - title: Release notes + title: Install or upgrade - path: /ee/licensing/ title: Licensing - sectiontitle: Docker Cluster diff --git a/ee/index.md b/ee/index.md index a63b98613f..fa34f28461 100644 --- a/ee/index.md +++ b/ee/index.md @@ -4,9 +4,7 @@ keywords: Docker Enterprise, documentation, manual, guide, reference, api, CLI title: Docker Enterprise --- -The Docker Enterprise platform business, including products, customers, and employees, has been acquired by Mirantis, inc., effective 13-November-2019. Among the Docker Enterprise platform technology and associated IP procured by Mirantis are Docker Engine - Enterprise, Docker Trusted Registry, Docker Universal Control Plane, and parts of the Docker CLI. - -As part of Mirantis, the Enterprise team will continue to develop and support the Docker Enterprise platform. 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 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). ## Docker Enterprise platform diff --git a/ee/release-notes.md b/ee/release-notes.md index 55c98ff4fc..7453b7bb0b 100644 --- a/ee/release-notes.md +++ b/ee/release-notes.md @@ -1,33 +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 -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 | - +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. ## Docker Enterprise components install and upgrade @@ -38,8 +15,4 @@ pages listed in the following **Docker Enterprise components install and upgrade | [DTR](/ee/dtr/release-notes/) | 2.7 | [Install DTR](/ee/dtr/admin/install/) | [Upgrade DTR](/ee/dtr/admin/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. - - - - +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. \ No newline at end of file From 0409b1960cd833ee4625468399ebed2f285be695 Mon Sep 17 00:00:00 2001 From: Dawn W Docker Date: Thu, 12 Dec 2019 15:09:00 -0800 Subject: [PATCH 06/10] moving engine - community install topic to manuals --- _data/toc.yaml | 4 ++++ ee/release-notes.md | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/_data/toc.yaml b/_data/toc.yaml index e07f19a381..ce57d258d3 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1243,6 +1243,10 @@ samples: title: Library references manuals: +- sectiontitle: Docker Engine - Community +- section: + - path: /install/ + title: Install Docker - Engine - Community - sectiontitle: Docker Assemble section: - path: /assemble/install/ diff --git a/ee/release-notes.md b/ee/release-notes.md index 7453b7bb0b..a7ae109ed4 100644 --- a/ee/release-notes.md +++ b/ee/release-notes.md @@ -6,8 +6,6 @@ keywords: engine enterprise, ucp, dtr, desktop enterprise, whats new, release no 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. -## Docker Enterprise components install and upgrade - | Component Release Notes | Version | Install | Upgrade | |---------|-----------|-------------------|-------------- | | [Docker Engine - Enterprise](/engine/release-notes/) | 19.03 | [Install Docker Engine - Enterprise](/ee/supported-platforms/) | [Upgrade Docker Engine - Enterprise](/ee/upgrade/) | From 71efaa622c9df361650e58ef3d77ce40b9189463 Mon Sep 17 00:00:00 2001 From: Dawn W Docker Date: Thu, 12 Dec 2019 15:34:53 -0800 Subject: [PATCH 07/10] working on community toc under manuals --- _data/toc.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/_data/toc.yaml b/_data/toc.yaml index ce57d258d3..7a12707a67 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1243,10 +1243,8 @@ samples: title: Library references manuals: -- sectiontitle: Docker Engine - Community -- section: - - path: /install/ - title: Install Docker - Engine - Community +- path: /install/ + title: Docker Engine - Community - sectiontitle: Docker Assemble section: - path: /assemble/install/ @@ -4186,7 +4184,7 @@ enterprise: title: Manage usage data collection - title: Get support path: /ee/get-support/ - - title: DTR API + - title: DTR API (swagger) path: /reference/dtr/2.7/api/ - sectiontitle: DTR CLI section: @@ -4210,7 +4208,7 @@ enterprise: title: restore - path: /reference/dtr/2.7/cli/upgrade/ title: upgrade - - title: UCP API + - title: UCP API (swagger) path: /reference/ucp/3.2/api/ - sectiontitle: UCP CLI section: From c0cb3233e9db7920fd6bcafa8c3ba3e3bd7a8bfc Mon Sep 17 00:00:00 2001 From: Dawn W Docker Date: Fri, 13 Dec 2019 10:34:36 -0800 Subject: [PATCH 08/10] moved get docker topics, created landing for new git docker section, moved Standards and Compliance topics to Enterprise --- _data/toc.yaml | 157 +++++++++++++++---------------------------- install/docker-ce.md | 6 ++ 2 files changed, 61 insertions(+), 102 deletions(-) create mode 100644 install/docker-ce.md diff --git a/_data/toc.yaml b/_data/toc.yaml index 7a12707a67..af7f92449a 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -20,72 +20,8 @@ horizontalnav: node: enterprise guides: -- sectiontitle: Get Docker - section: - - sectiontitle: Docker Engine - Community - section: - - sectiontitle: Cloud - section: - - sectiontitle: Docker for AWS - section: - - path: /docker-for-aws/why/ - title: Why Docker for AWS? - - path: /docker-for-aws/ - title: Setup & prerequisites - - path: /docker-for-aws/iam-permissions/ - title: IAM permissions - - path: /docker-for-aws/scaling/ - title: Scaling - - path: /docker-for-aws/upgrade/ - title: Upgrading - - path: /docker-for-aws/deploy/ - title: Deploy your app - - path: /docker-for-aws/persistent-data-volumes/ - title: Persistent data volumes - - path: /docker-for-aws/load-balancer/ - title: Load balancer - - path: /docker-for-aws/faqs/ - title: FAQs - - path: /docker-for-aws/opensource/ - title: Open source licensing - - path: /docker-for-aws/release-notes/ - title: Release notes - - path: /docker-for-aws/archive/ - title: Template archive - - sectiontitle: Docker for Azure - section: - - path: /docker-for-azure/why/ - title: Why Docker for Azure? - - path: /docker-for-azure/ - title: Setup & prerequisites - - path: /docker-for-azure/upgrade/ - title: Upgrading - - path: /docker-for-azure/deploy/ - title: Deploy your app - - path: /docker-for-azure/persistent-data-volumes/ - title: Persistent data volumes - - path: /docker-for-azure/faqs/ - title: FAQs - - path: /docker-for-azure/opensource/ - title: Open source licensing - - path: /docker-for-azure/release-notes/ - title: Release notes - - path: /docker-for-azure/archive/ - title: Template archive - - sectiontitle: Linux - section: - - path: /install/linux/docker-ce/centos/ - title: CentOS - - path: /install/linux/docker-ce/debian/ - title: Debian - - path: /install/linux/docker-ce/fedora/ - title: Fedora - - path: /install/linux/docker-ce/ubuntu/ - title: Ubuntu - - path: /install/linux/docker-ce/binaries/ - title: Binaries - - path: /install/linux/linux-postinstall/ - title: Optional Linux post-installation steps +- title: Get Docker + path: /install/docker-ce/ - sectiontitle: Get started section: - path: /engine/docker-overview/ @@ -380,40 +316,6 @@ guides: path: /engine/extend/config/ - path: /engine/extend/plugin_api/ title: Plugins API -- sectiontitle: Standards and compliance - section: - - path: /compliance/ - title: Docker standards and compliance - - sectiontitle: NIST - section: - - path: /compliance/nist/800_37/ - title: NIST SP 800-37 (RMF) - - path: /compliance/nist/800_53/ - title: NIST SP 800-53 - - path: /compliance/nist/800_190/ - title: NIST SP 800-190 - - path: /compliance/nist/fips140_2/ - title: FIPS 140-2 - - path: /compliance/nist/nistir_8176/ - title: NISTIR 8176 - - path: /compliance/nist/itl_october2017/ - title: NIST ITL Bulletin October 2017 - - sectiontitle: OSCAL - section: - - path: /compliance/oscal/ - title: OSCAL compliance guidance - - sectiontitle: CIS Benchmarks - section: - - path: /compliance/cis/docker_ee/ - title: Docker Enterprise Benchmark - - path: /compliance/cis/docker_ce/ - title: Docker Engine - Community Benchmark - - path: /compliance/cis/k8s/ - title: Kubernetes Benchmark - - path: /compliance/fedramp/ - title: FedRAMP - - path: /compliance/fisma/ - title: FISMA - sectiontitle: Open source at Docker section: - path: /opensource/ @@ -1243,8 +1145,25 @@ samples: title: Library references manuals: -- path: /install/ - title: Docker Engine - Community + +- sectiontitle: Docker Engine - Community + section: + - path: /install/ + title: Docker Engine - Community + - sectiontitle: Linux + section: + - path: /install/linux/docker-ce/centos/ + title: CentOS + - path: /install/linux/docker-ce/debian/ + title: Debian + - path: /install/linux/docker-ce/fedora/ + title: Fedora + - path: /install/linux/docker-ce/ubuntu/ + title: Ubuntu + - path: /install/linux/docker-ce/binaries/ + title: Binaries + - path: /install/linux/linux-postinstall/ + title: Optional Linux post-installation steps - sectiontitle: Docker Assemble section: - path: /assemble/install/ @@ -4236,3 +4155,37 @@ enterprise: title: uninstall-ucp - path: /reference/ucp/3.2/cli/upgrade/ title: upgrade +- sectiontitle: Standards and compliance + section: + - path: /compliance/ + title: Docker standards and compliance + - sectiontitle: NIST + section: + - path: /compliance/nist/800_37/ + title: NIST SP 800-37 (RMF) + - path: /compliance/nist/800_53/ + title: NIST SP 800-53 + - path: /compliance/nist/800_190/ + title: NIST SP 800-190 + - path: /compliance/nist/fips140_2/ + title: FIPS 140-2 + - path: /compliance/nist/nistir_8176/ + title: NISTIR 8176 + - path: /compliance/nist/itl_october2017/ + title: NIST ITL Bulletin October 2017 + - sectiontitle: OSCAL + section: + - path: /compliance/oscal/ + title: OSCAL compliance guidance + - sectiontitle: CIS Benchmarks + section: + - path: /compliance/cis/docker_ee/ + title: Docker Enterprise Benchmark + - path: /compliance/cis/docker_ce/ + title: Docker Engine - Community Benchmark + - path: /compliance/cis/k8s/ + title: Kubernetes Benchmark + - path: /compliance/fedramp/ + title: FedRAMP + - path: /compliance/fisma/ + title: FISMA diff --git a/install/docker-ce.md b/install/docker-ce.md new file mode 100644 index 0000000000..355c3b0465 --- /dev/null +++ b/install/docker-ce.md @@ -0,0 +1,6 @@ +--- +title: Install Docker Community +description: Lists the installation methods +keywords: docker, installation, install, Docker Engine - Community +--- + From f5b0d757552794a12114477980e6be9b165551fc Mon Sep 17 00:00:00 2001 From: Dawn W Docker Date: Fri, 13 Dec 2019 10:46:17 -0800 Subject: [PATCH 09/10] Revert "moved get docker topics, created landing for new git docker section, moved Standards and Compliance topics to Enterprise" This reverts commit c0cb3233e9db7920fd6bcafa8c3ba3e3bd7a8bfc. --- _data/toc.yaml | 157 ++++++++++++++++++++++++++++--------------- install/docker-ce.md | 6 -- 2 files changed, 102 insertions(+), 61 deletions(-) delete mode 100644 install/docker-ce.md diff --git a/_data/toc.yaml b/_data/toc.yaml index af7f92449a..7a12707a67 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -20,8 +20,72 @@ horizontalnav: node: enterprise guides: -- title: Get Docker - path: /install/docker-ce/ +- sectiontitle: Get Docker + section: + - sectiontitle: Docker Engine - Community + section: + - sectiontitle: Cloud + section: + - sectiontitle: Docker for AWS + section: + - path: /docker-for-aws/why/ + title: Why Docker for AWS? + - path: /docker-for-aws/ + title: Setup & prerequisites + - path: /docker-for-aws/iam-permissions/ + title: IAM permissions + - path: /docker-for-aws/scaling/ + title: Scaling + - path: /docker-for-aws/upgrade/ + title: Upgrading + - path: /docker-for-aws/deploy/ + title: Deploy your app + - path: /docker-for-aws/persistent-data-volumes/ + title: Persistent data volumes + - path: /docker-for-aws/load-balancer/ + title: Load balancer + - path: /docker-for-aws/faqs/ + title: FAQs + - path: /docker-for-aws/opensource/ + title: Open source licensing + - path: /docker-for-aws/release-notes/ + title: Release notes + - path: /docker-for-aws/archive/ + title: Template archive + - sectiontitle: Docker for Azure + section: + - path: /docker-for-azure/why/ + title: Why Docker for Azure? + - path: /docker-for-azure/ + title: Setup & prerequisites + - path: /docker-for-azure/upgrade/ + title: Upgrading + - path: /docker-for-azure/deploy/ + title: Deploy your app + - path: /docker-for-azure/persistent-data-volumes/ + title: Persistent data volumes + - path: /docker-for-azure/faqs/ + title: FAQs + - path: /docker-for-azure/opensource/ + title: Open source licensing + - path: /docker-for-azure/release-notes/ + title: Release notes + - path: /docker-for-azure/archive/ + title: Template archive + - sectiontitle: Linux + section: + - path: /install/linux/docker-ce/centos/ + title: CentOS + - path: /install/linux/docker-ce/debian/ + title: Debian + - path: /install/linux/docker-ce/fedora/ + title: Fedora + - path: /install/linux/docker-ce/ubuntu/ + title: Ubuntu + - path: /install/linux/docker-ce/binaries/ + title: Binaries + - path: /install/linux/linux-postinstall/ + title: Optional Linux post-installation steps - sectiontitle: Get started section: - path: /engine/docker-overview/ @@ -316,6 +380,40 @@ guides: path: /engine/extend/config/ - path: /engine/extend/plugin_api/ title: Plugins API +- sectiontitle: Standards and compliance + section: + - path: /compliance/ + title: Docker standards and compliance + - sectiontitle: NIST + section: + - path: /compliance/nist/800_37/ + title: NIST SP 800-37 (RMF) + - path: /compliance/nist/800_53/ + title: NIST SP 800-53 + - path: /compliance/nist/800_190/ + title: NIST SP 800-190 + - path: /compliance/nist/fips140_2/ + title: FIPS 140-2 + - path: /compliance/nist/nistir_8176/ + title: NISTIR 8176 + - path: /compliance/nist/itl_october2017/ + title: NIST ITL Bulletin October 2017 + - sectiontitle: OSCAL + section: + - path: /compliance/oscal/ + title: OSCAL compliance guidance + - sectiontitle: CIS Benchmarks + section: + - path: /compliance/cis/docker_ee/ + title: Docker Enterprise Benchmark + - path: /compliance/cis/docker_ce/ + title: Docker Engine - Community Benchmark + - path: /compliance/cis/k8s/ + title: Kubernetes Benchmark + - path: /compliance/fedramp/ + title: FedRAMP + - path: /compliance/fisma/ + title: FISMA - sectiontitle: Open source at Docker section: - path: /opensource/ @@ -1145,25 +1243,8 @@ samples: title: Library references manuals: - -- sectiontitle: Docker Engine - Community - section: - - path: /install/ - title: Docker Engine - Community - - sectiontitle: Linux - section: - - path: /install/linux/docker-ce/centos/ - title: CentOS - - path: /install/linux/docker-ce/debian/ - title: Debian - - path: /install/linux/docker-ce/fedora/ - title: Fedora - - path: /install/linux/docker-ce/ubuntu/ - title: Ubuntu - - path: /install/linux/docker-ce/binaries/ - title: Binaries - - path: /install/linux/linux-postinstall/ - title: Optional Linux post-installation steps +- path: /install/ + title: Docker Engine - Community - sectiontitle: Docker Assemble section: - path: /assemble/install/ @@ -4155,37 +4236,3 @@ enterprise: title: uninstall-ucp - path: /reference/ucp/3.2/cli/upgrade/ title: upgrade -- sectiontitle: Standards and compliance - section: - - path: /compliance/ - title: Docker standards and compliance - - sectiontitle: NIST - section: - - path: /compliance/nist/800_37/ - title: NIST SP 800-37 (RMF) - - path: /compliance/nist/800_53/ - title: NIST SP 800-53 - - path: /compliance/nist/800_190/ - title: NIST SP 800-190 - - path: /compliance/nist/fips140_2/ - title: FIPS 140-2 - - path: /compliance/nist/nistir_8176/ - title: NISTIR 8176 - - path: /compliance/nist/itl_october2017/ - title: NIST ITL Bulletin October 2017 - - sectiontitle: OSCAL - section: - - path: /compliance/oscal/ - title: OSCAL compliance guidance - - sectiontitle: CIS Benchmarks - section: - - path: /compliance/cis/docker_ee/ - title: Docker Enterprise Benchmark - - path: /compliance/cis/docker_ce/ - title: Docker Engine - Community Benchmark - - path: /compliance/cis/k8s/ - title: Kubernetes Benchmark - - path: /compliance/fedramp/ - title: FedRAMP - - path: /compliance/fisma/ - title: FISMA diff --git a/install/docker-ce.md b/install/docker-ce.md deleted file mode 100644 index 355c3b0465..0000000000 --- a/install/docker-ce.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Install Docker Community -description: Lists the installation methods -keywords: docker, installation, install, Docker Engine - Community ---- - From ca23efde3f481aecd5fa26e40cff719571e94094 Mon Sep 17 00:00:00 2001 From: Dawn W Docker Date: Fri, 13 Dec 2019 10:50:44 -0800 Subject: [PATCH 10/10] moved standards and compliance --- _data/toc.yaml | 68 +++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/_data/toc.yaml b/_data/toc.yaml index 7a12707a67..3140d1c26f 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -380,40 +380,6 @@ guides: path: /engine/extend/config/ - path: /engine/extend/plugin_api/ title: Plugins API -- sectiontitle: Standards and compliance - section: - - path: /compliance/ - title: Docker standards and compliance - - sectiontitle: NIST - section: - - path: /compliance/nist/800_37/ - title: NIST SP 800-37 (RMF) - - path: /compliance/nist/800_53/ - title: NIST SP 800-53 - - path: /compliance/nist/800_190/ - title: NIST SP 800-190 - - path: /compliance/nist/fips140_2/ - title: FIPS 140-2 - - path: /compliance/nist/nistir_8176/ - title: NISTIR 8176 - - path: /compliance/nist/itl_october2017/ - title: NIST ITL Bulletin October 2017 - - sectiontitle: OSCAL - section: - - path: /compliance/oscal/ - title: OSCAL compliance guidance - - sectiontitle: CIS Benchmarks - section: - - path: /compliance/cis/docker_ee/ - title: Docker Enterprise Benchmark - - path: /compliance/cis/docker_ce/ - title: Docker Engine - Community Benchmark - - path: /compliance/cis/k8s/ - title: Kubernetes Benchmark - - path: /compliance/fedramp/ - title: FedRAMP - - path: /compliance/fisma/ - title: FISMA - sectiontitle: Open source at Docker section: - path: /opensource/ @@ -4236,3 +4202,37 @@ enterprise: title: uninstall-ucp - path: /reference/ucp/3.2/cli/upgrade/ title: upgrade +- sectiontitle: Standards and compliance + section: + - path: /compliance/ + title: Docker standards and compliance + - sectiontitle: NIST + section: + - path: /compliance/nist/800_37/ + title: NIST SP 800-37 (RMF) + - path: /compliance/nist/800_53/ + title: NIST SP 800-53 + - path: /compliance/nist/800_190/ + title: NIST SP 800-190 + - path: /compliance/nist/fips140_2/ + title: FIPS 140-2 + - path: /compliance/nist/nistir_8176/ + title: NISTIR 8176 + - path: /compliance/nist/itl_october2017/ + title: NIST ITL Bulletin October 2017 + - sectiontitle: OSCAL + section: + - path: /compliance/oscal/ + title: OSCAL compliance guidance + - sectiontitle: CIS Benchmarks + section: + - path: /compliance/cis/docker_ee/ + title: Docker Enterprise Benchmark + - path: /compliance/cis/docker_ce/ + title: Docker Engine - Community Benchmark + - path: /compliance/cis/k8s/ + title: Kubernetes Benchmark + - path: /compliance/fedramp/ + title: FedRAMP + - path: /compliance/fisma/ + title: FISMA \ No newline at end of file