nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Maxim Cournoyer 2019-04-13 22:48:09 -04:00
parent a01d54f3bd
commit 80fec17f39
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/docker.scm
View File

@ -363,6 +363,11 @@ built-in registry server of Docker.")
(("var defaultCommandCandidates = .*") (("var defaultCommandCandidates = .*")
(string-append "var defaultCommandCandidates = []string{\"" (string-append "var defaultCommandCandidates = []string{\""
(assoc-ref inputs "runc") "/sbin/runc\"}"))) (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) (let ((source-files (filter (lambda (name)
(not (string-contains name "test"))) (not (string-contains name "test")))
(find-files "." "\\.go$")))) (find-files "." "\\.go$"))))
@ -511,6 +516,7 @@ built-in registry server of Docker.")
("containerd" ,containerd) ; for containerd-shim ("containerd" ,containerd) ; for containerd-shim
("coreutils" ,coreutils) ("coreutils" ,coreutils)
("dbus" ,dbus) ("dbus" ,dbus)
("docker-proxy" ,docker-libnetwork-cmd-proxy)
("e2fsprogs" ,e2fsprogs) ("e2fsprogs" ,e2fsprogs)
("git" ,git) ("git" ,git)
("iproute2" ,iproute) ("iproute2" ,iproute)