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

docs: fix example for proxies in daemon.json 

commit c846428cb6 added proxies to the
example `daemon.json`, based on the implementation that was added in
427c7cc5f8.

However, a follow-up pull request changed the proxy-configuration in`daemon.json`
to nest the configuration in a "proxies" struct, and the documentation was
not updated accordingly; see:
101dafd049

This patch fixes the example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2713d0bcde)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-05-19 17:21:34 +02:00
parent 44a7d9537f
commit 710a4042d1
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/commandline/dockerd.md
View File

@ -1251,9 +1251,11 @@ This is a full example of the allowed configuration options on Linux:
"fixed-cidr-v6": "", "fixed-cidr-v6": "",
"group": "", "group": "",
"hosts": [], "hosts": [],
"proxies": {
"http-proxy": "http://proxy.example.com:80", "http-proxy": "http://proxy.example.com:80",
"https-proxy": "https://proxy.example.com:443", "https-proxy": "https://proxy.example.com:443",
"no-proxy": "*.test.example.com,.example.org", "no-proxy": "*.test.example.com,.example.org",
},
"icc": false, "icc": false,
"init": false, "init": false,
"init-path": "/usr/libexec/docker-init", "init-path": "/usr/libexec/docker-init",