diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2019-04-13 22:48:09 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2019-05-05 21:21:02 -0400 |
| commit | 80fec17f39911b05b88ed5b609ccd0c44edc5001 (patch) | |
| tree | b9e949313bfd230a592520c9c56b796f8df4f3c1 /gnu/packages | |
| parent | a01d54f3bdc5bd8d11fdc82ac5d14a974f6c5a86 (diff) | |
| download | guix-80fec17f39911b05b88ed5b609ccd0c44edc5001.tar.gz guix-80fec17f39911b05b88ed5b609ccd0c44edc5001.zip | |
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.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/docker.scm | 6 |
1 files changed, 6 insertions, 0 deletions
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) |