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 documentation for dockerd --feature flag #5436

Merged
merged 4 commits into from
Sep 16, 2024

Conversation

thaJeztah
Copy link
Member

relates to:

First 3 commits were cherry-picked;

curl -fsSL "https://github.com/moby/moby/pull/48486/commits/fa06acc851fd1004e0c3610bbdab46669d362255.patch" | git am --3way -S
curl -fsSL "https://github.com/moby/moby/pull/48502/commits/2b6550bb2e4d462d8afa687b59766bb13783ef1f.patch" | git am --3way -S
curl -fsSL "https://github.com/moby/moby/pull/48502/commits/50e83a0713b750d7d63e25482b4df3deefb5827d.patch" | git am --3way -S

commit f13c08246d93dd5aae200d5881a3a374e6cac876 introduced
this flag, but did not yet update the manpage.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
The --feature flag allows the boolean value to be omitted.
If only a name is provided, the default is "true".

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 28.0.0 milestone Sep 16, 2024
@thaJeztah thaJeztah requested a review from a team as a code owner September 16, 2024 09:33
@thaJeztah thaJeztah changed the title Update dockerd docs docs: add documentation for dockerd --feature flag Sep 16, 2024
@codecov-commenter
Copy link

codecov-commenter commented Sep 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.75%. Comparing base (a18c896) to head (a42ca11).
Report is 8 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #5436   +/-   ##
=======================================
  Coverage   59.75%   59.75%           
=======================================
  Files         345      345           
  Lines       23428    23428           
=======================================
  Hits        13999    13999           
  Misses       8455     8455           
  Partials      974      974           

Comment on lines 979 to 982
Using both the command-line option and the "features" field in the configuration
file produces an error. The feature option can be specified multiple times
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Using both the command-line option and the "features" field in the configuration
file produces an error. The feature option can be specified multiple times
A feature should only be configured either through the `--feature` command line option or through the "features" field in the configuration file.
Using both produces an error. The feature option can be specified multiple times

I was thinking we could be a bit more explicit here.

Copy link
Member

@laurazard laurazard left a comment

Choose a reason for hiding this comment

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

Left a suggestion, but overall LGTM

Copy link
Member

@laurazard laurazard 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 self-assigned this Sep 16, 2024
@thaJeztah thaJeztah merged commit 4f78ffa into docker:master Sep 16, 2024
89 checks passed
@thaJeztah thaJeztah deleted the update_dockerd_docs branch September 16, 2024 11:44
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.

3 participants