Skip to content

Commit

Permalink
Update note about custom certs with system certs
Browse files Browse the repository at this point in the history
Fixed incorrect statement about example layout

Related to moby/moby#27918

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
  • Loading branch information
dmcgowan committed Nov 1, 2016
1 parent 2a696ed commit b4fb501
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions engine/security/certificates.md
Expand Up @@ -29,8 +29,10 @@ A custom certificate is configured by creating a directory under
`localhost`). All `*.crt` files are added to this directory as CA roots.

> **Note:**
> In the absence of any root certificate authorities, Docker
> will use the system default (i.e., host's root CA set).
> As of docker 1.13, on Linux any root certificates authorities will be merged
> in with the system defaults (i.e., host's root CA set). Prior to 1.13 and on
> Windows, the system default certificates will only be used when there are no
> custom root certificates provided.
The presence of one or more `<filename>.key/cert` pairs indicates to Docker
that there are custom certificates required for access to the desired
Expand All @@ -41,7 +43,7 @@ repository.
> order. If there is an authentication error (e.g., 403, 404, 5xx, etc.), Docker
> will continue to try with the next certificate.
The following illustrates a configuration with multiple certs:
The following illustrates a configuration with custom certificates:

```
/etc/docker/certs.d/ <-- Certificate directory
Expand Down

0 comments on commit b4fb501

Please sign in to comment.