summaryrefslogtreecommitdiff
path: root/gnu/packages/docker.scm
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-06-09 23:24:05 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-06-10 00:57:00 -0400
commite35383a76f0a1d1ba01f4b355d8df4ac341216b3 (patch)
tree7b9e08170cedeae7260a88afedddb8cc5cf613d1 /gnu/packages/docker.scm
parent352f23f71cdfd2f72a77906551b74f2d13f63688 (diff)
downloadguix-patches-e35383a76f0a1d1ba01f4b355d8df4ac341216b3.tar
guix-patches-e35383a76f0a1d1ba01f4b355d8df4ac341216b3.tar.gz
gnu: docker: Replace tini by tini-static.
The dynamically linked tini could fail in some environments, causing 'docker run' to exit with the following unhelpful error message: standard_init_linux.go:219: exec user process caused: no such file or directory Use the statically linked tini binary instead, which should work everywhere. * gnu/packages/docker.scm (docker)[phases]{patch-paths}: Replace 'tini' by 'tini-static'.
Diffstat (limited to 'gnu/packages/docker.scm')
-rw-r--r--gnu/packages/docker.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index cdae530820..8bac1b89ce 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -382,12 +382,12 @@ built-in registry server of Docker.")
(("DefaultInitBinary = .*")
(string-append "DefaultInitBinary = \""
(assoc-ref inputs "tini")
- "/bin/tini\"\n")))
+ "/bin/tini-static\"\n")))
(substitute* "daemon/config/config_common_unix_test.go"
(("expectedInitPath: \"docker-init\"")
(string-append "expectedInitPath: \""
(assoc-ref inputs "tini")
- "/bin/tini\"")))
+ "/bin/tini-static\"")))
(substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go"
(("var defaultCommandCandidates = .*")
(string-append "var defaultCommandCandidates = []string{\""