From 80fec17f39911b05b88ed5b609ccd0c44edc5001 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 13 Apr 2019 22:48:09 -0400 Subject: 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(+) (limited to 'gnu/packages/docker.scm') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index c1a99c9347..50ff1b69ba 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) -- cgit v1.2.3