Skip to content

[25.0 backport] docs, man: dockerd: add documentation for "--log-format" option#5566

Merged
thaJeztah merged 2 commits intodocker:25.0from
austinvazquez:cherry-pick-baceb4b1586f38b9d6c031ab0a696f32c52852f3-to-25.0
Oct 21, 2024
Merged

[25.0 backport] docs, man: dockerd: add documentation for "--log-format" option#5566
thaJeztah merged 2 commits intodocker:25.0from
austinvazquez:cherry-pick-baceb4b1586f38b9d6c031ab0a696f32c52852f3-to-25.0

Conversation

@austinvazquez
Copy link
Copy Markdown
Contributor

- What I did
Backport #5438 to 25.0 branch

- How I did it

git cherry-pick -xsS 9ae514fdc7a39f0af23cd25f8c38e714a9d0e6ae
git cherry-pick -xsS baceb4b1586f38b9d6c031ab0a696f32c52852f3

- Description for the changelog

n/a

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

This option was added in a08abec9f8d59eaa44c375900e254384a68c5a31,
as part of Docker v25.0, but did not update the docs and manpage.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9ae514f)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit baceb4b)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
Copy link
Copy Markdown
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

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Oct 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 58.44%. Comparing base (024b3c1) to head (a0f4097).
Report is 8 commits behind head on 25.0.

Additional details and impacted files
@@            Coverage Diff             @@
##             25.0    #5566      +/-   ##
==========================================
- Coverage   59.90%   58.44%   -1.47%     
==========================================
  Files         329      329              
  Lines       22066    27217    +5151     
==========================================
+ Hits        13219    15907    +2688     
- Misses       7921    10384    +2463     
  Partials      926      926              

Copy link
Copy Markdown
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 0bab007 into docker:25.0 Oct 21, 2024
@austinvazquez austinvazquez deleted the cherry-pick-baceb4b1586f38b9d6c031ab0a696f32c52852f3-to-25.0 branch October 22, 2024 13:58
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