docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9158 from ollypom/eeoverview-links 

Updated a few incorrect EE links
This commit is contained in:
Usha Mandya 2019-07-29 11:11:37 +01:00 committed by GitHub
parent 40cdd7fc5c 0df0774dc3
commit 8d2eb12d4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/aws.md
View File

@ -16,7 +16,7 @@ This topic discusses working with docker clusters in AWS, including how to:
## Prerequisites ## Prerequisites
- Completed installation of [Docker Desktop Enterprise](/ee/desktop/admin/install). - Completed installation of [Docker Desktop Enterprise](../ee/desktop/).
- [Access keys](https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys) to an AWS subscription. You can provide these credentials in many ways, but the recommended way is to create an `~/.aws/credentials` file. Refer to [AWS CLI configuration](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html) for details on creating one. - [Access keys](https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys) to an AWS subscription. You can provide these credentials in many ways, but the recommended way is to create an `~/.aws/credentials` file. Refer to [AWS CLI configuration](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html) for details on creating one.
## Create a cluster ## Create a cluster

4
ee/index.md
View File

@ -120,7 +120,7 @@ Docker Enterprise has its own built-in authentication mechanism with role-based
control (RBAC), so that you can control who can access and make changes to your 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 cluster and applications. Also, Docker Enterprise authentication integrates with LDAP
services and supports SAML SCIM to proactively synchronize with authentication providers. services and supports SAML SCIM to proactively synchronize with authentication providers.
[Learn about role-based access control](https://docs.docker.com/ee/ucp/authorization/). You can also opt to enable [PKI authentication](https://docs.docker.com/ee/enable-client-certificate-authentication/) to use client certificates, rather than username and password. [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} ![](images/docker-ee-overview-2.png){: .with-border}
@ -183,7 +183,7 @@ To further debug and diagnose cluster problems, use 'kubectl cluster-info dump'.
``` ```
## Docker Context ## Docker Context
A new Docker CLI plugin called `docker context` is available with this release. `docker context` helps manage connections to multiple environments so you do not have to remember and type out connection strings. [Read more](https://docs.docker.com/engine/reference/commandline/context/) about `docker context`. A new Docker CLI plugin called `docker context` is available with this release. `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 ## Where to go next