guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: gnu: docker: Replace tini by tini-static.


From: guix-commits
Subject: 02/02: gnu: docker: Replace tini by tini-static.
Date: Thu, 10 Jun 2021 00:57:37 -0400 (EDT)

apteryx pushed a commit to branch master
in repository guix.

commit e35383a76f0a1d1ba01f4b355d8df4ac341216b3
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Jun 9 23:24:05 2021 -0400

    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'.
---
 gnu/packages/docker.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index cdae530..8bac1b8 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{\""



reply via email to

[Prev in Thread] Current Thread [Next in Thread]