From 352f23f71cdfd2f72a77906551b74f2d13f63688 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 9 Jun 2021 22:43:55 -0400 Subject: gnu: tini: Update to 0.19.0 and provide tini-static. * gnu/packages/docker.scm (tini): Update to 0.19.0. Remove trailing #t. [phases]: Remove argument. [configure-flags]: New argument, to clear the CMAKE_INSTALL_RPATH option. --- gnu/packages/docker.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'gnu/packages/docker.scm') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 6083ed780b..cdae530820 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -716,7 +716,7 @@ defined in a per-project configuration file.") (define-public tini (package (name "tini") - (version "0.18.0") + (version "0.19.0") (source (origin (method git-fetch) (uri (git-reference @@ -725,19 +725,14 @@ defined in a per-project configuration file.") (file-name (git-file-name name version)) (sha256 (base32 - "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn")))) + "1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;tests require a Docker daemon - #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-static-build - ;; Disable the static build as it fails to install, with - ;; the error: "No valid ELF RPATH or RUNPATH entry exists - ;; in the file". - (lambda _ - (substitute* "CMakeLists.txt" - ((".*tini-static.*") "")) - #t))))) + ;; 'tini-static' is a static binary, which leads CMake to fail with + ;; ‘file RPATH_CHANGE could not write new RPATH: ...’. Clear + ;; CMAKE_INSTALL_RPATH to avoid that problem. + #:configure-flags '("-DCMAKE_INSTALL_RPATH="))) (home-page "https://github.com/krallin/tini") (synopsis "Tiny but valid init for containers") (description "Tini is an init program specifically designed for use with -- cgit v1.2.3 From e35383a76f0a1d1ba01f4b355d8df4ac341216b3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 9 Jun 2021 23:24:05 -0400 Subject: 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(-) (limited to 'gnu/packages/docker.scm') 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{\"" -- cgit v1.2.3