Skip to content

Commit

Permalink
Update documentation of proxy server configuration
Browse files Browse the repository at this point in the history
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 docker#4686
  • Loading branch information
Steve Larkin committed Sep 21, 2017
1 parent e2a441f commit beb2a98
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions engine/userguide/networking/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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"
}
}
}
```
Expand Down

0 comments on commit beb2a98

Please sign in to comment.