diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2019-08-29 10:01:43 +0900 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2019-09-05 09:38:23 +0900 |
| commit | b8e7e20841285c862c684a864a23545489cb9227 (patch) | |
| tree | bc6e0429d4b60310b673c21ca087b066e55be62b /gnu/packages | |
| parent | 92086eeda39cf14ff1241b2e610154fad98965cd (diff) | |
| download | guix-b8e7e20841285c862c684a864a23545489cb9227.tar.gz guix-b8e7e20841285c862c684a864a23545489cb9227.zip | |
gnu: docker: Add support for tini.
* gnu/packages/docker.scm (docker)[inputs]: Add tini.
[phases]{patch-paths}: Patch the path of the default init binary.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/docker.scm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 8f80cd54d8..28eff0a56c 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -369,7 +369,16 @@ built-in registry server of Docker.") (("StockRuntimeName = .*") (string-append "StockRuntimeName = \"" (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" (("var defaultCommandCandidates = .*") (string-append "var defaultCommandCandidates = []string{\"" @@ -542,6 +551,7 @@ built-in registry server of Docker.") ("runc" ,runc) ("util-linux" ,util-linux) ("lvm2" ,lvm2) + ("tini" ,tini) ("xfsprogs" ,xfsprogs) ("xz" ,xz))) (native-inputs |