From d13d95c3067ee03b514f6e250902321560ffe42b Mon Sep 17 00:00:00 2001 From: usha-mandya Date: Mon, 22 Jul 2019 13:28:10 +0100 Subject: [PATCH] Fix minor issues for GA --- cluster/aws.md | 6 +++--- cluster/cluster-file.md | 14 +++++++------- docker-hub/official_images.md | 2 +- ee/index.md | 10 ++++------ ee/ucp/ucp-architecture.md | 6 +++--- 5 files changed, 18 insertions(+), 20 deletions(-) diff --git a/cluster/aws.md b/cluster/aws.md index 9bae3c8501..f67f5de43a 100644 --- a/cluster/aws.md +++ b/cluster/aws.md @@ -105,7 +105,7 @@ The values are substituted in the cluster definition, which makes it easy to define a re-usable cluster definition and then change the variables to create multiple instances of a cluster. -Run `docker cluster create --file cluster.yml --name quickstart` +Run `docker cluster create --file cluster.yml --name quickstart`. $ docker cluster create --file cluster.yml --name quickstart Please provide a value for ucp_password @@ -114,7 +114,7 @@ Run `docker cluster create --file cluster.yml --name quickstart` Planning cluster on aws [OK] Creating: [=========================== ] 44% -After approximately 10 minutes, resources are provisioned Docker Enterprise installation is started: +After approximately 10 minutes, resources are provisioned, and Docker Enterprise installation is started: $ docker cluster create --file cluster.yml --name quickstart Please provide a value for ucp_password @@ -156,7 +156,7 @@ To view an inventory of the clusters you created, run `docker cluster ls`: ID NAME PROVIDER ENGINE UCP DTR STATE 911c882340b2 quickstart acme, aws ee-stable-18.09.5 docker/ucp:3.1.6 docker/dtr:2.6.5 running -For detailed information about the cluster, run `docker cluster inspect quickstart` +For detailed information about the cluster, run `docker cluster inspect quickstart`. $ docker cluster inspect quickstart ```yaml diff --git a/cluster/cluster-file.md b/cluster/cluster-file.md index be65c09acd..f628c61ee0 100644 --- a/cluster/cluster-file.md +++ b/cluster/cluster-file.md @@ -94,16 +94,16 @@ The following components are available: - `subscription`: (Optional) A string value representing the subscription ID. - `license`: (Optional) A path to the cluster's license file. -- `cloudstor`: (Optional) Configuration options for Docker CloudStor -- `dtr`: (Optional) Configuration options for Docker Trusted Registry -- `engine`: (Optional) Configuration options for Docker Engine -- `ucp`: (Optional) Configuration options for Docker Universal Control Plane +- `cloudstor`: (Optional) Configuration options for Docker CloudStor. +- `dtr`: (Optional) Configuration options for Docker Trusted Registry. +- `engine`: (Optional) Configuration options for Docker Engine. +- `ucp`: (Optional) Configuration options for Docker Universal Control Plane. - `registry`: (Optional) Configuration options for authenticating nodes with a registry to pull Docker images. #### cloudstor Customizes the installation of Docker Cloudstor. -- `version`: (Optional) The version of Cloudstor to install. Default is `1.0` +- `version`: (Optional) The version of Cloudstor to install. Default is `1.0`. - `use_efs`: (Optional) Specifies whether an Elastic File System should be provisioned. Defaults to `false`. #### dtr @@ -123,7 +123,7 @@ The following optional elements can be specified: - `ca`: (Optional) The path to a root CA public certificate. - `key`: (Optional) The path to a TLS private key. - `cert`: (Optional) The path to a public key certificate. -- `install_options`: (Optional) Additional [DTR install options](https://docs.docker.com/reference/dtr/2.6/cli/install/) +- `install_options`: (Optional) Additional [DTR install options](https://docs.docker.com/reference/dtr/2.6/cli/install/). #### engine Customizes the installation of Docker Enterprise Engine. @@ -205,7 +205,7 @@ The following optional elements can be specified: - `cert`: Specifies a path to a public key certificate. - `install_options`: Lists additional [UCP install options](https://docs.docker.com/reference/ucp/3.1/cli/install/) -##### Additional UCP configuration options: +##### Additional UCP configuration options Docker Cluster also accepts all UCP configuration options and creates the initial UCP config on installation. The following list provides supported options: - `anonymize_tracking`: Anonymizes analytic data. Specify 'true' to hide the license ID. Defaults to 'false'. diff --git a/docker-hub/official_images.md b/docker-hub/official_images.md index d924313c56..3f1bd8a11d 100644 --- a/docker-hub/official_images.md +++ b/docker-hub/official_images.md @@ -16,7 +16,7 @@ designed to: starting point for the majority of users. * Provide drop-in solutions for popular programming language runtimes, data - stores, and other services, similar to what a Platform-as-a-Service (PAAS) + stores, and other services, similar to what a Platform as a Service (PAAS) would offer. * Exemplify [`Dockerfile` best practices](/engine/userguide/eng-image/dockerfile_best-practices/) diff --git a/ee/index.md b/ee/index.md index 9a8e01f250..f2e20cefe7 100644 --- a/ee/index.md +++ b/ee/index.md @@ -7,7 +7,7 @@ redirect_from: - /manuals/ --- -Docker Enterprise is a Containers-as-a-Service (CaaS) platform that enables a secure software supply +Docker Enterprise is a Containers as a Service (CaaS) platform that enables a secure software supply chain and deploys diverse applications for high availability across disparate infrastructure, both on-premises and in the cloud. @@ -20,7 +20,7 @@ orchestration requires, like provisioning pods, containers, and cluster resources. Self-healing components ensure that Docker Enterprise clusters remain highly available. -Role-based access control applies to Kubernetes and Swarm orchestrators, and +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. @@ -112,10 +112,8 @@ 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 -swarm and applications. Also, Docker Enterprise authentication integrates with LDAP -services. +Docker Enterprise has its own built-in authentication mechanism with RBAC, so that you can control who can access and make changes to your +swarm and applications. Also, Docker Enterprise authentication integrates with LDAP services. [Learn about role-based access control](access-control/index.md). ![](images/docker-ee-overview-2.png){: .with-border} diff --git a/ee/ucp/ucp-architecture.md b/ee/ucp/ucp-architecture.md index aababfa3ab..ead953a75b 100644 --- a/ee/ucp/ucp-architecture.md +++ b/ee/ucp/ucp-architecture.md @@ -52,7 +52,7 @@ If the node is a: ## UCP internal components -The core component of UCP is a globally-scheduled service called `ucp-agent`. +The core component of UCP is a globally scheduled service called `ucp-agent`. When you install UCP on a node, or join a node to a swarm that's being managed by UCP, the `ucp-agent` service starts running on that node. @@ -74,7 +74,7 @@ persist the state of UCP. These are the UCP services running on manager nodes: | UCP component | Description | |:--------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | k8s_calico-kube-controllers | A cluster-scoped Kubernetes controller used to coordinate Calico networking. Runs on one manager node only. | -| k8s_calico-node | The Calico node agent, which coordinates networking fabric according to the cluster-wide Calico configuration. Part of the `calico-node` daemonset. Runs on all nodes. Configure the CNI plugin by using the `--cni-installer-url` flag. If this flag isn't set, UCP uses Calico as the default CNI plugin. | +| k8s_calico-node | The Calico node agent, which coordinates networking fabric according to the cluster-wide Calico configuration. Part of the `calico-node` daemonset. Runs on all nodes. Configure the container network interface (CNI) plugin by using the `--cni-installer-url` flag. If this flag isn't set, UCP uses Calico as the default CNI plugin. | | k8s_install-cni_calico-node | A container that's responsible for installing the Calico CNI plugin binaries and configuration on each host. Part of the `calico-node` daemonset. Runs on all nodes. | | k8s_POD_calico-node | Pause container for the `calico-node` pod. | | k8s_POD_calico-kube-controllers | Pause container for the `calico-kube-controllers` pod. | @@ -115,7 +115,7 @@ services running on worker nodes: |:----------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | k8s_calico-node | The Calico node agent, which coordinates networking fabric according to the cluster-wide Calico configuration. Part of the `calico-node` daemonset. Runs on all nodes. | | k8s_install-cni_calico-node | A container that's responsible for installing the Calico CNI plugin binaries and configuration on each host. Part of the `calico-node` daemonset. Runs on all nodes. | -| k8s_POD_calico-node | "Pause" container for the Calico-node pod. By default, this container is hidden, but you can see it by running `docker ps -a`. | +| k8s_POD_calico-node | Pause container for the Calico-node pod. By default, this container is hidden, but you can see it by running `docker ps -a`. | | ucp-agent | Monitors the node and ensures the right UCP services are running | | ucp-interlock-extension | Helper service that reconfigures the ucp-interlock-proxy service based on the swarm workloads that are running. | | ucp-interlock-proxy | A service that provides load balancing and proxying for swarm workloads. Only runs when you enable Layer 7 routing. |