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

remove dockerd man-page (moved back to moby repository) #5773

Merged
merged 1 commit into from
Jan 27, 2025

Conversation

thaJeztah
Copy link
Member

relates to:

When splitting the docker CLI from the moby/moby repository, the dockerd documentation and man-pages were moved to the CLI repository. This was a bit of a bad choice, as now the documentation and code lived in separate repositories, but when the CLI and dockerd packages were split, the man page for dockerd ended up in the CLI package.

Starting with moby@d6e9b5f, the dockerd man-page has been reintegrated into the moby repository, so we cab remove it from the CLI repository.

- 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)

When splitting the docker CLI from the moby/moby repository, the dockerd
documentation and man-pages were moved to the CLI repository. This was a
bit of a bad choice, as now the documentation and code lived in separate
repositories, but when the CLI and dockerd packages were split, the man
page for dockerd ended up in the CLI package.

Starting with [moby@d6e9b5f], the dockerd man-page has been reintegrated
into the moby repository, so we cab  remove it from the CLI repository.

[moby@d6e9b5f]: moby/moby@d6e9b5f

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@codecov-commenter
Copy link

codecov-commenter commented Jan 25, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.42%. Comparing base (b8879a4) to head (a87cb97).
Report is 2 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #5773   +/-   ##
=======================================
  Coverage   59.42%   59.42%           
=======================================
  Files         347      347           
  Lines       29402    29402           
=======================================
  Hits        17472    17472           
  Misses      10958    10958           
  Partials      972      972           

@thaJeztah thaJeztah requested a review from a team January 25, 2025 00:19
@thaJeztah
Copy link
Member Author

Don't merge yet; need to look at the right approach for this; merging this PR should make that error go away, but the same may still happen if someone happened to mix versions, so perhaps we need additional metadata on the package to indicate "docker-ce's dockerd man-page replaces the one in docker-ce-cli";

@thaJeztah
Copy link
Member Author

OK; other PR is fixed after adding Replaces: in the deb control file; let me bring this one in 👍

@thaJeztah thaJeztah merged commit cc224b8 into docker:master Jan 27, 2025
107 checks passed
@thaJeztah thaJeztah deleted the remove_dockerd_manpage branch January 27, 2025 14:20
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