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

docs: add default-network-opt daemon option #4635

Merged
merged 1 commit into from
Nov 6, 2023

Conversation

dvdksn
Copy link
Contributor

@dvdksn dvdksn commented Nov 3, 2023

Signed-off-by: David Karlsson [email protected]

- What I did

Added a description for the default-network-opt flag and daemon config option

- How I did it

- How to verify it

- Description for the changelog

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

moose

@dvdksn
Copy link
Contributor Author

dvdksn commented Nov 3, 2023

@thaJeztah I noticed this flag is not included in the man page either. Where do I update that?

@codecov-commenter
Copy link

codecov-commenter commented Nov 3, 2023

Codecov Report

Merging #4635 (485e16c) into master (a6351d0) will not change coverage.
Report is 8 commits behind head on master.
The diff coverage is n/a.

❗ Current head 485e16c differs from pull request most recent head 848fe62. Consider uploading reports for the commit 848fe62 to get more accurate results

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #4635   +/-   ##
=======================================
  Coverage   59.74%   59.74%           
=======================================
  Files         288      288           
  Lines       24849    24849           
=======================================
  Hits        14846    14846           
  Misses       9117     9117           
  Partials      886      886           

@thaJeztah
Copy link
Member

@dvdksn dockerd man page is here; https://github.com/docker/cli/blob/5d6612798a195b30edf4244ff06f18e80b1167d5/man/dockerd.8.md#synopsis

You can add the option to the "synopsis" section and the list of options under it

docs/reference/commandline/dockerd.md Outdated Show resolved Hide resolved
docs/reference/commandline/dockerd.md Outdated Show resolved Hide resolved
docs/reference/commandline/dockerd.md Outdated Show resolved Hide resolved
docs/reference/commandline/dockerd.md Outdated Show resolved Hide resolved
@thaJeztah
Copy link
Member

Perhaps we should also have the networking section updated to (similar to the logging-driver options that can be set in daemon.json) mention that these defaults can be configured on the daemon.

@dvdksn dvdksn force-pushed the docs-dockerd-default-nw-opt branch from 4b633b4 to ad65959 Compare November 6, 2023 09:11
@dvdksn
Copy link
Contributor Author

dvdksn commented Nov 6, 2023

revised—PTAL @thaJeztah :)

@dvdksn dvdksn force-pushed the docs-dockerd-default-nw-opt branch from ad65959 to 485e16c Compare November 6, 2023 09:15
@dvdksn dvdksn self-assigned this Nov 6, 2023
docs/reference/commandline/dockerd.md Outdated Show resolved Hide resolved
docs/reference/commandline/dockerd.md Outdated Show resolved Hide resolved
@dvdksn dvdksn force-pushed the docs-dockerd-default-nw-opt branch from 485e16c to 848fe62 Compare November 6, 2023 09:48
Copy link
Member

@akerouanton akerouanton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah thaJeztah merged commit b336124 into docker:master Nov 6, 2023
76 checks passed
@thaJeztah
Copy link
Member

@dvdksn if you have time to do a cherry-pick for the 24.0 branch, then this will make its way to the docs 😅

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.

4 participants