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

Merge pull request #7426 from docker/notary-reference-client-config 

Update client-config.md
This commit is contained in:
Maria Bermudez 2018-09-26 13:51:49 -07:00 committed by GitHub
parent 07722100d4 bcbafad67b
commit 718784351c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
notary/reference/client-config.md
View File

@ -125,7 +125,7 @@ but the pinned certificates take highest priority for validation, followed
by the pinned CA, followed by TOFUS (TOFU over HTTPS). The diagram below by the pinned CA, followed by TOFUS (TOFU over HTTPS). The diagram below
describes this validation flow: describes this validation flow:
![validation flow](https://cdn.rawgit.com/docker/notary/27469f01fe244bdf70f34219616657b336724bc3/docs/images/trust-pinning-flow.png") ![validation flow](https://cdn.rawgit.com/docker/notary/27469f01fe244bdf70f34219616657b336724bc3/docs/images/trust-pinning-flow.png)
Only one trust pinning option is used to validate a GUN even if multiple Only one trust pinning option is used to validate a GUN even if multiple
sections are specified, and any validation failure results in a failed sections are specified, and any validation failure results in a failed
@ -176,6 +176,7 @@ passphrase.
|`NOTARY_TARGETS_PASSPHRASE` | The targets (an online) key passphrase | |`NOTARY_TARGETS_PASSPHRASE` | The targets (an online) key passphrase |
|`NOTARY_SNAPSHOT_PASSPHRASE` | The snapshot (an online) key passphrase | |`NOTARY_SNAPSHOT_PASSPHRASE` | The snapshot (an online) key passphrase |
|`NOTARY_DELEGATION_PASSPHRASE` | The delegation (an online) key passphrase | |`NOTARY_DELEGATION_PASSPHRASE` | The delegation (an online) key passphrase |
|`NOTARY_AUTH` | The notary server credentials: `<username>:<password>` encoded in base64 |
If provided, the passphrase in `NOTARY_DELEGATION_PASSPHRASE` If provided, the passphrase in `NOTARY_DELEGATION_PASSPHRASE`