Skip to content

Commit

Permalink
Merge pull request #4310 from thaJeztah/24.0_backport_fix_daemon_proxy
Browse files Browse the repository at this point in the history
  • Loading branch information
thaJeztah authored May 19, 2023
2 parents aa40216 + 298e679 commit 6802122
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions docs/reference/commandline/dockerd.md
Original file line number Diff line number Diff line change
Expand Up @@ -1252,9 +1252,11 @@ This is a full example of the allowed configuration options on Linux:
"fixed-cidr-v6": "",
"group": "",
"hosts": [],
"http-proxy": "http://proxy.example.com:80",
"https-proxy": "https://proxy.example.com:443",
"no-proxy": "*.test.example.com,.example.org",
"proxies": {
"http-proxy": "http://proxy.example.com:80",
"https-proxy": "https://proxy.example.com:443",
"no-proxy": "*.test.example.com,.example.org",
},
"icc": false,
"init": false,
"init-path": "/usr/libexec/docker-init",
Expand Down

0 comments on commit 6802122

Please sign in to comment.