[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: docker: Add support for tini.
From: |
guix-commits |
Subject: |
02/02: gnu: docker: Add support for tini. |
Date: |
Wed, 4 Sep 2019 21:30:08 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit b8e7e20841285c862c684a864a23545489cb9227
Author: Maxim Cournoyer <address@hidden>
Date: Thu Aug 29 10:01:43 2019 +0900
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.
---
gnu/packages/docker.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 8f80cd5..28eff0a 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