Skip to content

Commit 6802122

Browse files
authored
Merge pull request #4310 from thaJeztah/24.0_backport_fix_daemon_proxy
2 parents aa40216 + 298e679 commit 6802122

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

docs/reference/commandline/dockerd.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,9 +1252,11 @@ This is a full example of the allowed configuration options on Linux:
12521252
"fixed-cidr-v6": "",
12531253
"group": "",
12541254
"hosts": [],
1255-
"http-proxy": "http://proxy.example.com:80",
1256-
"https-proxy": "https://proxy.example.com:443",
1257-
"no-proxy": "*.test.example.com,.example.org",
1255+
"proxies": {
1256+
"http-proxy": "http://proxy.example.com:80",
1257+
"https-proxy": "https://proxy.example.com:443",
1258+
"no-proxy": "*.test.example.com,.example.org",
1259+
},
12581260
"icc": false,
12591261
"init": false,
12601262
"init-path": "/usr/libexec/docker-init",

0 commit comments

Comments
 (0)