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

Fix typo in dockerd reference documentation #4687

Merged
merged 1 commit into from
Dec 3, 2023
Merged

Fix typo in dockerd reference documentation #4687

merged 1 commit into from
Dec 3, 2023

Conversation

TheRealGramdalf
Copy link
Contributor

- What I did
- Fixed a typo in the docker daemon reference docs

- How I did it

- How to verify it

  • See files changed diff

- Description for the changelog

Fixed a typo in the docker daemon reference documentation

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

Lily, goblin of the legs

@thaJeztah
Copy link
Member

Thank you for contributing! It appears your commit message is missing a DCO sign-off,
causing the DCO check to fail.

We require all commit messages to have a Signed-off-by line with your name
and e-mail (see "Sign your work"
in the CONTRIBUTING.md in this repository), which looks something like:

Signed-off-by: YourFirsName YourLastName <[email protected]>

There is no need to open a new pull request, but to fix this (and make CI pass),
you need to amend the commit(s) in this pull request, and "force push" the amended
commit.

Unfortunately, it's not possible to do so through GitHub's web UI, so this needs
to be done through the git commandline.

You can find some instructions in the output of the DCO check (which can be found
in the "checks" tab on this pull request), as well as in the Moby contributing guide.

Steps to do so "roughly" come down to:

  1. Set your name and e-mail in git's configuration:

    git config --global user.name "YourFirstName YourLastName"
    git config --global user.email "[email protected]"

    (Make sure to use your real name (not your GitHub username/handle) and e-mail)

  2. Clone your fork locally

  3. Check out the branch associated with this pull request

  4. Sign-off and amend the existing commit(s)

    git commit --amend --no-edit --signoff

    If your pull request contains multiple commits, either squash the commits (if
    needed) or sign-off each individual commit.

  5. Force push your branch to GitHub (using the --force or --force-with-lease flags) to update the pull request.

Sorry for the hassle, and let me know if you need help or more detailed instructions!

@TheRealGramdalf
Copy link
Contributor Author

TheRealGramdalf commented Dec 2, 2023

My apologies, the sign-off you linked said:

Then you just add a line to every git commit message:

So I thought just adding it to the commit message was fine. Everything should be good to go now.

@thaJeztah thaJeztah removed the dco/no label Dec 3, 2023
@thaJeztah thaJeztah added this to the 25.0.0 milestone Dec 3, 2023
@codecov-commenter
Copy link

codecov-commenter commented Dec 3, 2023

Codecov Report

Merging #4687 (e93ec2f) into master (c1455b6) will not change coverage.
Report is 6 commits behind head on master.
The diff coverage is n/a.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #4687   +/-   ##
=======================================
  Coverage   59.75%   59.75%           
=======================================
  Files         287      287           
  Lines       24821    24821           
=======================================
  Hits        14832    14832           
  Misses       9103     9103           
  Partials      886      886           

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, thank you!

@thaJeztah thaJeztah merged commit 0acee94 into docker:master Dec 3, 2023
76 checks passed
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