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

corrected docs around custom CA support beta v. stable 

fixed link and format

copyedit per review comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas 2016-10-14 14:05:25 -07:00
parent 9d619ddbe1
commit 8002e755b7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-for-mac/faqs.md
View File

@ -116,7 +116,7 @@ Networking topic.
### How do I add custom CA certificates?
Starting with Docker for Mac 1.12.1, 2016-09-16 (stable) and Beta 27 Release Notes (2016-09-28 1.12.2-rc1-beta27), all trusted certificate authorities (CAs) (root or intermediate) are supported.
Starting with Docker for Mac Beta 27 Release Notes (2016-09-28 1.12.2-rc1-beta27) and follow-on Beta releases, all trusted certificate authorities (CAs) (root or intermediate) are supported. (**Note:** Custom CA certificates are not yet supported on stable releases.)
Docker for Mac creates a certificate bundle of all user-trusted CAs based on the Mac Keychain, and appends it to Moby trusted certificates. So if an enterprise SSL certificate is trusted by the user on the host, it will be trusted by Docker for Mac.

8
docker-for-mac/index.md
View File

@ -180,7 +180,13 @@ Choose <img src="images/whale-x.png"> --> **Preferences** from the menu bar. You
![Advanced Preference settings-advanced](images/settings-advanced.png)
* **Adding registries** - As an alternative to using [Docker Hub](https://hub.docker.com/) to store your public or private images or [Docker Trusted Registry](https://docs.docker.com/docker-trusted-registry/overview/), you can use Docker to set up your own insecure [registry](https://docs.docker.com/registry/introduction/). Add URLs for insecure registries and registry mirrors on which to host your images.
* **Adding registries** - As an alternative to using [Docker Hub](https://hub.docker.com/) to store your public or private images or [Docker
Trusted Registry](https://docs.docker.com/docker-trusted-registry/overview/),
you can use Docker to set up your own insecure
[registry](https://docs.docker.com/registry/introduction/). Add URLs for
insecure registries and registry mirrors on which to host your images. (See
also, [How do I add custom CA
certificates?](faqs.md#how-do-i-add-custom-ca-certificates) in the FAQs.)
* **HTTP proxy settings** - Docker for Mac will detect HTTP/HTTPS Proxy Settings and automatically propagate these to Docker and to your containers.
For example, if you set your proxy settings to `http://proxy.example.com`, Docker will use this proxy when pulling containers.