Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[24.0 backport] docs: fix example for proxies in daemon.json #4310

Merged
merged 1 commit into from
May 19, 2023

Conversation

thaJeztah
Copy link
Member

commit c846428 (#4199) added proxies to the example daemon.json, based on the implementation that was added in moby/moby@427c7cc (moby/moby#42835).

However, a follow-up pull request changed the proxy-configuration indaemon.json to nest the configuration in a "proxies" struct, and the documentation was not updated accordingly; see: moby/moby@101dafd (moby/moby#43448)

This patch fixes the example.

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

commit c846428 added proxies to the
example `daemon.json`, based on the implementation that was added in
moby/moby@427c7cc.

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:
moby/moby@101dafd

This patch fixes the example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2713d0b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 24.0.1 milestone May 19, 2023
@thaJeztah thaJeztah merged commit 6802122 into docker:24.0 May 19, 2023
@thaJeztah thaJeztah deleted the 24.0_backport_fix_daemon_proxy branch May 19, 2023 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants