diff mbox series

[bug#37250] gnu: docker: Add support for tini.

Message ID 87ftlge4g1.fsf@gmail.com
State Accepted
Headers show
Series [bug#37250] gnu: docker: Add support for tini. | expand

Commit Message

Maxim Cournoyer Sept. 1, 2019, 9:44 a.m. UTC 
Hello!

This enables the use of the --init argument for example with 'docker
run'.

Comments

Ludovic Courtès Sept. 4, 2019, 9:34 p.m. UTC | #1 
Hello Maxim,

Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:

> From fdf8690097a236ce5799b70cf4e43ccf7e420022 Mon Sep 17 00:00:00 2001
> From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
> Date: Thu, 29 Aug 2019 10:01:11 +0900
> Subject: [PATCH 1/2] gnu: Add tini.
>
> * gnu/packages/docker.scm (tini): New variable.

[...]

> From eb575e31612d89763454eb82bbfd64f87d74be9c Mon Sep 17 00:00:00 2001
> From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
> Date: Thu, 29 Aug 2019 10:01:43 +0900
> Subject: [PATCH 2/2] 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.

LGTM, thanks!

Ludo’.
Maxim Cournoyer Sept. 5, 2019, 1:31 a.m. UTC | #2 
Ludovic Courtès <ludo@gnu.org> writes:

> Hello Maxim,
>
> Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:
>
>> From fdf8690097a236ce5799b70cf4e43ccf7e420022 Mon Sep 17 00:00:00 2001
>> From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
>> Date: Thu, 29 Aug 2019 10:01:11 +0900
>> Subject: [PATCH 1/2] gnu: Add tini.
>>
>> * gnu/packages/docker.scm (tini): New variable.
>
> [...]
>
>> From eb575e31612d89763454eb82bbfd64f87d74be9c Mon Sep 17 00:00:00 2001
>> From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
>> Date: Thu, 29 Aug 2019 10:01:43 +0900
>> Subject: [PATCH 2/2] 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.
>
> LGTM, thanks!
>
> Ludo’.

Thank you! Merged with commit b8e7e20841.

Maxim
diff mbox series

Patch

From eb575e31612d89763454eb82bbfd64f87d74be9c Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Thu, 29 Aug 2019 10:01:43 +0900
Subject: [PATCH 2/2] 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 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
-- 
2.23.0