From 298e67926e25218a85b3e956785ac20e9c2c9ec2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 May 2023 17:21:34 +0200 Subject: [PATCH] docs: fix example for proxies in daemon.json commit c846428cb639f10053df376ab8f4ab0adddf02d1 added proxies to the example `daemon.json`, based on the implementation that was added in https://github.com/moby/moby/commit/427c7cc5f86364466c7173e8ca59b97c3876471d. 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: https://github.com/moby/moby/commit/101dafd049949a4da65dcefd495828a6644e1ce1 This patch fixes the example. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 2713d0bcdef9486f80b057f08f63f65126e15938) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/dockerd.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md index 2a69c2e466bb..b39bdbaa9b99 100644 --- a/docs/reference/commandline/dockerd.md +++ b/docs/reference/commandline/dockerd.md @@ -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",