ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 06:36:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: docker: Add support for tini.

Browse source 
* gnu/packages/docker.scm (docker)[inputs]: Add tini.
[phases]{patch-paths}: Patch the path of the default init binary.
This commit is contained in:
Maxim Cournoyer 2019-08-29 10:01:43 +09:00
parent 92086eeda3
commit b8e7e20841
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/docker.scm
View file

@ -369,7 +369,16 @@ (define-public docker
(("StockRuntimeName = .*") (("StockRuntimeName = .*")
(string-append "StockRuntimeName = \"" (string-append "StockRuntimeName = \""
(assoc-ref inputs "runc") (assoc-ref inputs "runc")
"/sbin/runc\"\n"))) "/sbin/runc\"\n"))
(("DefaultInitBinary = .*")
(string-append "DefaultInitBinary = \""
(assoc-ref inputs "tini")
"/bin/tini\"\n")))
(substitute* "daemon/config/config_common_unix_test.go"
(("expectedInitPath: \"docker-init\"")
(string-append "expectedInitPath: \""
(assoc-ref inputs "tini")
"/bin/tini\"")))
(substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go" (substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go"
(("var defaultCommandCandidates = .*") (("var defaultCommandCandidates = .*")
(string-append "var defaultCommandCandidates = []string{\"" (string-append "var defaultCommandCandidates = []string{\""
@ -542,6 +551,7 @@ (define-public docker
("runc" ,runc) ("runc" ,runc)
("util-linux" ,util-linux) ("util-linux" ,util-linux)
("lvm2" ,lvm2) ("lvm2" ,lvm2)
("tini" ,tini)
("xfsprogs" ,xfsprogs) ("xfsprogs" ,xfsprogs)
("xz" ,xz))) ("xz" ,xz)))
(native-inputs (native-inputs