Bug 946694 – app-containers/docker-27.4.1 - file collision with app-containers/docker-cli-27.4.0

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description Toralf Förster 2024-12-20 10:09:36 UTC]

 * Press Ctrl-C to Stop
 * 
 * app-containers/docker-cli-27.4.0:0::gentoo
 * 	/usr/share/man/man8/dockerd.8.bz2
 * 
 * Package 'app-containers/docker-27.4.1' NOT merged due to file

  -------------------------------------------------------------------

  This is an unstable amd64 chroot image at a tinderbox (==build bot)
  name: 23.0_no_multilib-20241218-145502

  The attached etc.portage.tar.xz has all details.
  -------------------------------------------------------------------

gcc-config -l:
 [1] x86_64-pc-linux-gnu-14 *
clang version 19.1.6
llvm-config: 19.1.6
Python 3.12.8
go version go1.23.4 linux/amd64
  [1]   php8.3 *
Available Ruby profiles:
  (none found)
Available Rust versions:
  [1]   rust-bin-1.77.1
  [2]   rust-bin-1.81.0
  [3]   rust-bin-1.83.0 *
The following VMs are available for generation-2:
*)	Eclipse Temurin JDK 21.0.5_p11 [openjdk-bin-21]
2)	Eclipse Temurin JDK 8.432_p06 [openjdk-bin-8]
Available Java Virtual Machines:
  [1]   openjdk-bin-8 
  [2]   openjdk-bin-21  system-vm


  HEAD of ::gentoo
commit 28a1f87ff3d044c64744f93cb51ea242419916f6
Author: Repository mirror & CI <[e-mail]>
Date:   Fri Dec 20 07:03:41 2024 +0000

    2024-12-20 07:03:40 UTC

emerge -qpvO =app-containers/docker-27.4.1
[ebuild  N    ] app-containers/docker-27.4.1  USE="container-init overlay2 seccomp -apparmor -btrfs (-selinux) -systemd"

[Comment 1 Toralf Förster 2024-12-20 10:09:37 UTC]

Created attachment 914451 [details]
emerge-info.txt

[Comment 2 Toralf Förster 2024-12-20 10:09:38 UTC]

Created attachment 914452 [details]
app-containers:docker-27.4.1:20241220-072036.log.xz

[Comment 3 Toralf Förster 2024-12-20 10:09:40 UTC]

Created attachment 914453 [details]
emerge-history.txt

[Comment 4 Toralf Förster 2024-12-20 10:09:40 UTC]

Created attachment 914454 [details]
etc.clang.tar.xz

[Comment 5 Toralf Förster 2024-12-20 10:09:41 UTC]

Created attachment 914455 [details]
etc.portage.tar.xz

[Comment 6 Toralf Förster 2024-12-20 10:09:43 UTC]

Created attachment 914456 [details]
logs.tar.xz

[Comment 7 Toralf Förster 2024-12-20 10:09:44 UTC]

Created attachment 914457 [details]
qlist-info.txt.xz

[Comment 8 Sam James 2024-12-20 10:17:08 UTC]

commit 87b9b33195397de7688bb37fc3982296fdaf97bd
Author: William Hubbs <[e-mail]>
Date:   Thu Dec 19 22:08:06 2024 -0600

    app-containers/docker: add 27.4.1

    Signed-off-by: William Hubbs <[e-mail]>

does
```
[...]
 src_install() {
@@ -280,6 +289,7 @@ src_install() {

        dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
        dodoc -r docs/*
+       doman man/man8/dockerd.8

        # note: intentionally not using "doins" so that we preserve +x bits
        dodir /usr/share/${PN}/contrib
```

and

commit 5893d39ae06210876383bfb7309a3f4cbc0885fc
Author: William Hubbs <[e-mail]>
Date:   Thu Dec 19 22:08:06 2024 -0600

    app-containers/docker-cli: add 27.4.1

    Signed-off-by: William Hubbs <[e-mail]>

does (ignore the -/+ here, the issue is the 'doman' line with a glob in the context lines)
```
@@ -56,7 +52,7 @@ src_compile() {
 src_install() {
        dobin build/docker
        doman "${WORKDIR}"/man/man?/*
-       dobashcomp contrib/completion/bash/*
+       dobashcomp contrib/completion/bash/docker
        bashcomp_alias docker dockerd
        insinto /usr/share/fish/vendor_completions.d/
        doins contrib/completion/fish/docker.fish
```

[Comment 9 William Hubbs 2024-12-24 21:22:03 UTC]

The issue is that the dockerd.8 man page exists in both upstream packages.
In earlier releases we were installing it with docker-cli, but it makes
more sense to install it with docker.

If you upgrade docker-cli before docker, the collision will not happen
since docker now owns the dockerd.8 man page.

I believe I can fix this by blocking older versions of docker-cli in
tdocker.

[Comment 10 Sam James 2024-12-24 21:26:05 UTC]

Sounds good.

[Comment 11 Larry the Git Cow 2024-12-25 20:14:08 UTC]

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=896e667b8800510d00e6aab36f94110682515a4d

commit 896e667b8800510d00e6aab36f94110682515a4d
Author:     William Hubbs <[e-mail]>
AuthorDate: 2024-12-25 18:51:11 +0000
Commit:     William Hubbs <[e-mail]>
CommitDate: 2024-12-25 20:01:21 +0000

    app-containers/docker:  27.4.1-r1 revbump
    
    - add support for nvidia gpu access via the cuda use flag
    - fix the docker-runc symlink
    - fix a file collision with old versions of docker-cli
    
    Closes: https://bugs.gentoo.org/946681
    Closes: https://bugs.gentoo.org/946684
    Closes: https://bugs.gentoo.org/946694
    Signed-off-by: William Hubbs <[e-mail]>

 app-containers/docker/docker-27.4.1-r1.ebuild | 331 ++++++++++++++++++++++++++
 1 file changed, 331 insertions(+)