06/07: gnu: docker: Patch the reference to the docker proxy.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 80fec17f39911b05b88ed5b609ccd0c44edc5001
Author: Maxim Cournoyer <address@hidden>
Date:   Sat Apr 13 22:48:09 2019 -0400

    gnu: docker: Patch the reference to the docker proxy.
    
    * gnu/packages/docker.scm (docker)[inputs]: Add docker-libnetwork-cmd-proxy.
    * gnu/packages/docker.scm (docker)[phases]{patch-paths}: Patch proxy.go to
    refer to the docker-proxy binary by its absolute path.
---
 gnu/packages/docker.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index c1a99c9..50ff1b6 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -363,6 +363,11 @@ built-in registry server of Docker.")
                (("var defaultCommandCandidates = .*")
                 (string-append "var defaultCommandCandidates = []string{\""
                                (assoc-ref inputs "runc") "/sbin/runc\"}")))
+             (substitute* 
"vendor/github.com/docker/libnetwork/portmapper/proxy.go"
+               (("var userlandProxyCommandName = .*")
+                (string-append "var userlandProxyCommandName = \""
+                               (assoc-ref inputs "docker-proxy")
+                               "/bin/proxy\"\n")))
              (let ((source-files (filter (lambda (name)
                                            (not (string-contains name "test")))
                                          (find-files "." "\\.go$"))))
@@ -511,6 +516,7 @@ built-in registry server of Docker.")
        ("containerd" ,containerd)       ; for containerd-shim
        ("coreutils" ,coreutils)
        ("dbus" ,dbus)
+       ("docker-proxy" ,docker-libnetwork-cmd-proxy)
        ("e2fsprogs" ,e2fsprogs)
        ("git" ,git)
        ("iproute2" ,iproute)