Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
deb,rpm: include dockerd man-page in docker-ce package
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, which means that we can build the man-page from that repository, and remove it from the CLI repository. This patch updates the packing to do so: Before this patch; dpkg-deb -c docker-ce_0.0.0~20250124134141.b8879a4-1~ubuntu.24.04~noble_arm64.deb | grep -E '^-' -rw-r--r-- root/root 642 2025-01-24 14:29 ./etc/default/docker -rwxr-xr-x root/root 2946 2025-01-24 14:29 ./etc/init.d/docker -rwxr-xr-x root/root 2741336 2025-01-24 19:54 ./usr/bin/docker-proxy -rw-r--r-- root/root 1727 2025-01-24 14:29 ./usr/lib/systemd/system/docker.service -rw-r--r-- root/root 295 2025-01-24 14:29 ./usr/lib/systemd/system/docker.socket -rwxr-xr-x root/root 604336 2025-01-24 19:54 ./usr/libexec/docker/docker-init -rw-r--r-- root/root 2248 2025-01-24 14:29 ./usr/share/doc/docker-ce/README.md -rw-r--r-- root/root 168 2025-01-24 19:54 ./usr/share/doc/docker-ce/changelog.Debian.gz rpm -qpl ./docker-ce-0.0.0~20250124134141.b8879a4-0.fc41.aarch64.rpm /etc/docker /usr/bin/docker-proxy /usr/bin/dockerd /usr/lib/systemd/system/docker.service /usr/lib/systemd/system/docker.socket /usr/libexec/docker/docker-init With this patch: dpkg-deb -c docker-ce_0.0.0~20250124134141.b8879a4-1~ubuntu.24.04~noble_arm64.deb | grep -E '^-' -rw-r--r-- root/root 642 2025-01-24 14:29 ./etc/default/docker -rwxr-xr-x root/root 2946 2025-01-24 14:29 ./etc/init.d/docker -rwxr-xr-x root/root 2741336 2025-01-24 20:55 ./usr/bin/docker-proxy -rwxr-xr-x root/root 79458592 2025-01-24 20:55 ./usr/bin/dockerd -rw-r--r-- root/root 1727 2025-01-24 14:29 ./usr/lib/systemd/system/docker.service -rw-r--r-- root/root 295 2025-01-24 14:29 ./usr/lib/systemd/system/docker.socket -rwxr-xr-x root/root 604336 2025-01-24 20:55 ./usr/libexec/docker/docker-init -rw-r--r-- root/root 2248 2025-01-24 14:29 ./usr/share/doc/docker-ce/README.md -rw-r--r-- root/root 166 2025-01-24 20:55 ./usr/share/doc/docker-ce/changelog.Debian.gz -rw-r--r-- root/root 6561 2025-01-24 20:55 ./usr/share/man/man8/dockerd.8.gz rpm -qpl ./docker-ce-0.0.0~20250124134141.b8879a4-0.fc41.aarch64.rpm /etc/docker /usr/bin/docker-proxy /usr/bin/dockerd /usr/lib/systemd/system/docker.service /usr/lib/systemd/system/docker.socket /usr/libexec/docker/docker-init /usr/share/man/man8/dockerd.8.gz Given that the dockerd man-page was previously packaged as part of docker-ce-cli, we need to add a "Replaces:" condition to the package, to prevent dpkg from detecting it as a conflict when an older version of the docker-ce-cli package was installed that contains the manpage; Unpacking docker-ce (5:0.0.0~20250124134141.b8879a4-1~raspbian.12~bookworm) ... dpkg: error processing archive ./deb/debbuild/raspbian-bookworm/docker-ce_0.0.0~20250124134141.b8879a4-1~raspbian.12~bookworm_armhf.deb (--install): trying to overwrite '/usr/share/man/man8/dockerd.8.gz', which is also in package docker-ce-cli 5:0.0.0~20250124134141.b8879a4-1~raspbian.12~bookworm From the [Debian manual][1] > 7.6.1. Overwriting files in other packages > > It is usually an error for a package to contain files which are on the > system in another package. However, if the overwriting package declares > that it Replaces the one containing the file being overwritten, then dpkg > will replace the file from the old package with that from the new. The > file will no longer be listed as “owned” by the old package and will be > taken over by the new package. [1]: https://www.debian.org/doc/debian-policy/ch-relationships.html [moby@d6e9b5f]: moby/moby@d6e9b5f Signed-off-by: Sebastiaan van Stijn <[email protected]>
- Loading branch information