Skip to content

Commit 924457a

Browse files
authored
Merge pull request #505 from mboersma/ecr-config-fixes
ref(configuring-registry): clarify ECR registry variables
2 parents 9ae8f9c + 495e1a1 commit 924457a

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

src/installing-workflow/configuring-registry.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ Deis Workflow currently supports
3737
export ECR_ACCESS_KEY, ECR_SECRET_KEY, ECR_REGION, ECR_REGISTRY_ID, ECR_HOSTNAME
3838
```
3939

40-
To use [IAM credentials][aws-iam], it is not necessary to set `ECR_ACCESS_KEY` or `ECR_SECRET_KEY`. `ECR_ACCESS_KEY` and `ECR_SECRET_KEY` are the Access Key ID and Secret Access Key which have access to the container registry.
41-
If `ECR_REGISTRY_ID` is left empty then default registry of the account will be used.
42-
`ECR_HOSTNAME` needs to be set if the default hostname is an alias (CNAME) or the cluster is behind a proxy.
40+
`ECR_ACCESS_KEY` and `ECR_SECRET_KEY` are an AWS access key ID and secret access key with permission to use the container registry. To use [IAM credentials][aws-iam], it is not necessary to set either value, in which case the credentials used to provision the cluster will be used.
41+
42+
If `ECR_REGISTRY_ID` is empty, the default registry for the provisioning account will be used.
43+
44+
`ECR_HOSTNAME` only needs to be set if the default hostname is an alias (CNAME) or if the cluster is behind a proxy.
4345

4446

4547
* For `REGISTRY_LOCATION=off-cluster`:
@@ -66,4 +68,5 @@ Deis Workflow currently supports
6668
[ecr]: http://docs.aws.amazon.com/AmazonECR/latest/userguide/ECR_GetStarted.html
6769
[gcr]: https://cloud.google.com/container-registry/
6870
[srvAccount]: https://support.google.com/cloud/answer/6158849#serviceaccounts
71+
[aws-iam]: https://aws.amazon.com/iam/
6972
[namespace]: https://docs.docker.com/registry/spec/api/#/overview

0 commit comments

Comments
 (0)