GNU bug report logs - #74746
Updating Docker to v27

Previous Next

Full log

Message #56 received at 74746 <at> debbugs.gnu.org (full text, mbox):

From: Arthur Rodrigues <arthurhdrodrigues <at> proton.me>
To: "74746 <at> debbugs.gnu.org" <74746 <at> debbugs.gnu.org>
Cc: "arthurhdrodrigues <at> proton.me" <arthurhdrodrigues <at> proton.me>
Subject: [PATCH 4/6] gnu: docker: Avoid build failing when looking for
 buildkit in PATH.
Date: Wed, 11 Jun 2025 15:08:50 +0000

Change-Id: Ib8c1967322bcad424dac8210378bd78df85c020a
---
 gnu/packages/docker.scm | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 755e2d7211..448261e61c 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -500,10 +500,19 @@ (define-public docker
                    "exec.Command")
                   ;; Search for ZFS in PATH.
                   (("\\<LookPath\\(\"zfs\"\\)") "LooxPath(\"zfs\")")
-                 ;; Do not fail when buildkit-qemu-<target> isn't found.
-                 ;; FIXME: We might need to package buildkit and docker's
-                 ;; buildx plugin, to support qemu-based docker containers.
-                  (("\\<LookPath\\(\"buildkit-qemu-\"") "LooxPath(\"buildkit-qemu-\"")
+                  ;; Do not fail when buildkit-qemu-<target> isn't found.
+                  ;; FIXME: We might need to package buildkit and docker's
+                  ;; buildx plugin, to support qemu-based docker containers.
+                  (("\\<LookPath\\(\"buildkit-qemu-\"")
+                   "LooxPath(\"buildkit-qemu-\"")
+                  (("\\<LookPath\\(\"buildkit-cni-bridge\"")
+                   "LooxPath(\"buildkit-cni-bridge\"")
+                  (("\\<LookPath\\(\"buildkit-cni-loopback\"")
+                   "LooxPath(\"buildkit-cni-loopback\"")
+                  (("\\<LookPath\\(\"buildkit-cni-host-local\"")
+                   "LooxPath(\"buildkit-cni-host-local\"")
+                  (("\\<LookPath\\(\"buildkit-cni-firewall\"")
+                   "LooxPath(\"buildkit-cni-firewall\"")
                   ;; Fail on other unsubstituted LookPaths.
                   (("\\<LookPath\\(\"") "Guix_doesnt_want_LookPath\\(\"")
                   (("\\<LooxPath") "LookPath")))))
-- 
2.49.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.