From beb2a98bd77b5596e5688f48956f6dc326cfbd8b Mon Sep 17 00:00:00 2001 From: Steve Larkin Date: Thu, 21 Sep 2017 15:43:52 +0200 Subject: [PATCH] Update documentation of proxy server configuration As per the implementation in docker/cli#93 the proxy server addresses are specified per docker daemon or as defaults. Updated the example to show the default option. Fixes #4686 --- engine/userguide/networking/index.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/engine/userguide/networking/index.md b/engine/userguide/networking/index.md index bcb7f94812d..aeea442a5b5 100644 --- a/engine/userguide/networking/index.md +++ b/engine/userguide/networking/index.md @@ -579,7 +579,7 @@ configure it in different ways: 1. On the Docker client, create or edit the file `~/.config.json` in the home directory of the user which starts containers. Add JSON such as the - following, substituting the type of proxy with `httpsproxy` or `ftpproxy` if + following, substituting the type of proxy with `httpsProxy` or `ftpProxy` if necessary, and substituting the address and port of the proxy server. You can configure multiple proxy servers at the same time. @@ -592,8 +592,11 @@ configure it in different ways: { "proxies": { - "httpProxy": "http://127.0.0.1:3001", - "noProxy": "*.test.example.com,.example2.com" + "default": + { + "httpProxy": "http://127.0.0.1:3001", + "noProxy": "*.test.example.com,.example2.com" + } } } ```