From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 31 20:45:57 2019 Received: (at submit) by debbugs.gnu.org; 1 Sep 2019 00:45:57 +0000 Received: from localhost ([127.0.0.1]:56078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4E0C-0007zs-Ou for submit@debbugs.gnu.org; Sat, 31 Aug 2019 20:45:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:55683) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4E0B-0007zl-7X for submit@debbugs.gnu.org; Sat, 31 Aug 2019 20:45:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33975) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4E09-0003XR-Mu for guix-patches@gnu.org; Sat, 31 Aug 2019 20:45:55 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: ** X-Spam-Status: No, score=2.7 required=5.0 tests=BAYES_50, DATE_IN_FUTURE_06_12, FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4E08-00066b-8V for guix-patches@gnu.org; Sat, 31 Aug 2019 20:45:53 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]:41361) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4E07-000627-Ui for guix-patches@gnu.org; Sat, 31 Aug 2019 20:45:52 -0400 Received: by mail-pl1-x62b.google.com with SMTP id m9so4989212pls.8 for ; Sat, 31 Aug 2019 17:45:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:user-agent:mime-version; bh=YyHueIIRkzf/XeV9evVLEkQPoN4+MVkODMHhAwJlBKc=; b=dVWgjHu8Shwsz6AkLukR6HJaAxXTMocx/uTgYm2CAtMWJb58snkpNpobuV4N0SPkAV GpyhzIZlN+pP+nxyEZnPznarhSoECpMuy3byStpibap1L/WLp5nX/ecguDCKxaq/WD0K n3eKgCxhZNOMv7PSU1PM7diqdNO7IP8gOhZE97sM5ORiUqbfvGWmq1G+KW08/iqNmOBb W7OWrm94tusJR91SI2V9d5CkX9bwIYg1CWGnkBqD/XLnEBKJarEnAZKc2Ljve0EenZXP qrbWuqso7WoDyJnIOnDfFRqjuYWJk/R9i7rNir6t64HavOF0YDnoiS4TVr8W+6b+UlXJ 5hew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:user-agent :mime-version; bh=YyHueIIRkzf/XeV9evVLEkQPoN4+MVkODMHhAwJlBKc=; b=DA6G8JtjK3FygEz2TGZwLgbfYpvzHX0SpH657QfNI+kVAxnreBHs9yiZgdCCyx0CND hkIBfF6FWCwY4PRSij62bcm6Izfpcj/5w4yMpN418ce5DAmY/VzcAH2fh+U5gynJURMu ruNTUYFOwLzhx+oABO0/ruFIKF8/WfnIKRjFCEZ1ZrXBFCeHDuk7L3mdZtVHYyLmNK0/ QWe/UJ5Kod3SunuFv8HqsQYVGwmoK6ezGPoOmm0OQO/yHMns0vYw25Vo1wpcZNBwiGFc L5fN4hOZFDCPO0Wl1R/13RWWVychPefdxrfeLjiAbgwg98IbTXM4hj8kiLEfG1pA/zZs i+bg== X-Gm-Message-State: APjAAAX1/LGbnJ9qGmTu2z0wttHRiS6kaTHc8pISAyAlK+Qwe97OdMId 7ZOtW72Ipwx4HJZSJKZ/pA2ob81s X-Google-Smtp-Source: APXvYqz+9kkpM0wIgljrZv/+b94cQdHCXXxVZrsATPAKyWJMUIRbOYsnxfqLaOxbPABgEZ5bhTGvTQ== X-Received: by 2002:a17:902:2b87:: with SMTP id l7mr16210766plb.226.1567298750468; Sat, 31 Aug 2019 17:45:50 -0700 (PDT) Received: from x200 ([240f:c7:38e9:1:314b:485c:9ba4:72c6]) by smtp.gmail.com with ESMTPSA id v67sm16045885pfb.45.2019.08.31.17.45.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Aug 2019 17:45:49 -0700 (PDT) From: Maxim Cournoyer To: guix-patches Subject: [PATCH] gnu: docker: Add support for tini. Date: Sun, 01 Sep 2019 18:44:30 +0900 Message-ID: <87ftlge4g1.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::62b X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello! This enables the use of the --init argument for example with 'docker run'. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-tini.patch Content-Transfer-Encoding: quoted-printable From=20fdf8690097a236ce5799b70cf4e43ccf7e420022 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 29 Aug 2019 10:01:11 +0900 Subject: [PATCH 1/2] gnu: Add tini. * gnu/packages/docker.scm (tini): New variable. =2D-- gnu/packages/docker.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 94cfa2bdb7..8f80cd54d8 100644 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -25,6 +25,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system python) @@ -655,3 +656,36 @@ provisioning etc.") way to run commands in the current directory, but within a Docker container defined in a per-project configuration file.") (license license:gpl3+))) + +(define-public tini + (package + (name "tini") + (version "0.18.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/krallin/tini.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn")))) + (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, wi= th + ;; the error: "No valid ELF RPATH or RUNPATH entry exi= sts + ;; in the file". + (lambda _ + (substitute* "CMakeLists.txt" + ((".*tini-static.*") "")) + #t))))) + (home-page "https://github.com/krallin/tini") + (synopsis "Tiny but valid init for containers") + (description "Tini is an init program specifically designed for use wi= th +containers. It manages a single child process and ensures that any zombie +processes produced from it are reaped and that signals are properly forwar= ded. +Tini is integrated with Docker.") + (license license:expat))) =2D-=20 2.23.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-gnu-docker-Add-support-for-tini.patch Content-Transfer-Encoding: quoted-printable From=20eb575e31612d89763454eb82bbfd64f87d74be9c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer 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. =2D-- 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 =2D-- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -369,7 +369,16 @@ built-in registry server of Docker.") (("StockRuntimeName =3D .*") (string-append "StockRuntimeName =3D \"" (assoc-ref inputs "runc") =2D "/sbin/runc\"\n"))) + "/sbin/runc\"\n")) + (("DefaultInitBinary =3D .*") + (string-append "DefaultInitBinary =3D \"" + (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/runcex= ecutor/executor.go" (("var defaultCommandCandidates =3D .*") (string-append "var defaultCommandCandidates =3D []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 =2D-=20 2.23.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEJ9WGpPiQCFQyn/CfEmDkZILmNWIFAl1rkv4ACgkQEmDkZILm NWLJKA/8DxJ25h1CZUEIGQRbkLPP/ub8xdIW/q0XltOVKHv3ZFzrrtoyfiCAGWT8 U5LAtE+pqArZ20VlqPbeY5AecbjVoN1I/ksN6BUnYCWdFvnTFckB417sRuH0kaB0 yywQT5gfdO3DD5EcB50YCVb11NjSfNqbZnV4ir4FjYYzueBl30/x8tk9RBeSVZma i4KXOm5a4NHPdSBsTWWHveRmIYvjJqLZDpsYn4IYVN4yNivLE5ASmDyifzDn3hDt UwmuL8n//bhZbbAg9RWliPT9Wi8Ry0dPpozzw4ZugMaB8FY90sf+SolqzZGG0RoR YHXy8Qo8XbQta7a3XwBMb7Kdp8N8PopwvbcCBXezZD96ne9zVpkq3vTYHR00Xbtu AugnJMfye8hWLUcG7rEEkRv8mgFxzW7zbC6wVYWhd6E8ghu8D+IWJCWF3F23bbB7 GE6BenQSWGoaJGEHd2vpb7/c0SGp5+IJWKjV6dELlZInRNwLxgEiIYNwqvQtEPr5 whOxJEFhuMvA+060kcdyuBpsG9DEM/gkAQ6IoZqr/kQr6PitWULB3rRZ7PmyJ4Mh 3VMD6EjdvMgIW8Hz7ltLMPdRrsU3FCkKEuiq8GB/eWkVaEm5cHo2AQkVkQMjPv1N O1jXLcEiI+4j/TFRI5H+gFxpCRXkQlWyrgAlpPslrurYARfUGxQ= =vqfw -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 04 17:35:06 2019 Received: (at 37250) by debbugs.gnu.org; 4 Sep 2019 21:35:06 +0000 Received: from localhost ([127.0.0.1]:34436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i5cvi-0006mw-28 for submit@debbugs.gnu.org; Wed, 04 Sep 2019 17:35:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53525) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i5cvg-0006mM-GM for 37250@debbugs.gnu.org; Wed, 04 Sep 2019 17:35:04 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:54459) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1i5cvb-0001ys-C5; Wed, 04 Sep 2019 17:34:59 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=43008 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1i5cvY-0006ar-H4; Wed, 04 Sep 2019 17:34:59 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Maxim Cournoyer Subject: Re: [bug#37250] [PATCH] gnu: docker: Add support for tini. References: <87ftlge4g1.fsf@gmail.com> Date: Wed, 04 Sep 2019 23:34:48 +0200 In-Reply-To: <87ftlge4g1.fsf@gmail.com> (Maxim Cournoyer's message of "Sun, 01 Sep 2019 18:44:30 +0900") Message-ID: <87y2z3zqx3.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 37250 Cc: 37250@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello Maxim, Maxim Cournoyer skribis: > From fdf8690097a236ce5799b70cf4e43ccf7e420022 Mon Sep 17 00:00:00 2001 > From: Maxim Cournoyer > 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 > 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=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 04 21:31:27 2019 Received: (at 37250-done) by debbugs.gnu.org; 5 Sep 2019 01:31:27 +0000 Received: from localhost ([127.0.0.1]:34531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i5gcR-00073G-0V for submit@debbugs.gnu.org; Wed, 04 Sep 2019 21:31:27 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:36978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i5gcK-00072q-Gp for 37250-done@debbugs.gnu.org; Wed, 04 Sep 2019 21:31:21 -0400 Received: by mail-pf1-f196.google.com with SMTP id y9so602208pfl.4 for <37250-done@debbugs.gnu.org>; Wed, 04 Sep 2019 18:31:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-transfer-encoding; bh=b0KUJ/x20ms3BoSUwiHjOS00EkxMRJVjXw5lNmAGJCI=; b=eeOgaNDn2dsYRdXUChdPCLm9GSORFD/WaFhcvaHl0ONmjRZw8zcPdP51xbPTRGknKs SN2bJrNN97Q0jkSJqHCDiImgrVheaWsF/S9Ce6GdZSAUr/wbJjwOxqfWt1fBZLQShl8E bFSmiVhpVsw0cWCpGDCXnJgzGi21oo68hPaImtZ8w9i0pamNOVs7IrJjvzCwrsQTwwk7 f1csvy1gBrlmnRaGD8OciUjxOee8chbW86oBRa4LMb8NK+b2KLg/MrVMAg7p1G9cCV1o LUaG6xCtwqx3Rz8H72PIjzwqmPgbmg6FSZ/yDH7YWrOuCiWbGR5OwUCw+7B+6sPZVj0C x64A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references :user-agent:date:message-id:mime-version:content-transfer-encoding; bh=b0KUJ/x20ms3BoSUwiHjOS00EkxMRJVjXw5lNmAGJCI=; b=IbT/7u0V0bcl71Jw70Awzp3gb6YA5qyM64Wy7OuR28JZV5askupA8lZ8s2rDlHaWIS j3P/Nahq2zkphG427lma/SM8kAjXdwR2b8pgha4t/nxeK8i87mNxNGcGVp32YAvQmDak bwxG9eWBUTJHA7YLvSZ68zIWJaX3UXGTF4n2DZZwhwMD7p5H633f+UikbSh7VmDTj88E P+d8sQQX7AJeW2UKFB2aSvmfemJt3zM81QFN+e9n3HVqKQMDYB8fJM5r3oX4kApf5Y/h EXbF+8MWeUb3ICuLrCVOFIfrcMhTQbdUC3ZNesfg9ezKOmSZ4alf6o1qobsAypImxECS Do0A== X-Gm-Message-State: APjAAAVaV364cn3km6yW0CJR0ytiSBjRVI1libT0qvgx6l5RMpXnqFqU urmClWZ/5Ck96reNtPIwKX5DHW2J X-Google-Smtp-Source: APXvYqzvSbYQjB0aXUjSkE2PsxppYBdF2Z3tXBZYPtvhzbJ6MCrx1lhrhEkB1BCh66ZWK0dH4jHpKg== X-Received: by 2002:a63:4f1f:: with SMTP id d31mr839701pgb.265.1567647073948; Wed, 04 Sep 2019 18:31:13 -0700 (PDT) Received: from x200 ([240f:c7:38e9:1:314b:485c:9ba4:72c6]) by smtp.gmail.com with ESMTPSA id r23sm262441pjo.22.2019.09.04.18.31.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 18:31:13 -0700 (PDT) From: Maxim Cournoyer To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#37250] [PATCH] gnu: docker: Add support for tini. In-Reply-To: <87y2z3zqx3.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Wed, 04 Sep 2019 23:34:48 +0200") References: <87ftlge4g1.fsf@gmail.com> <87y2z3zqx3.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) Date: Thu, 05 Sep 2019 10:31:09 +0900 Message-ID: <87lfv3y1eq.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 37250-done Cc: 37250-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Ludovic Court=C3=A8s writes: > Hello Maxim, > > Maxim Cournoyer skribis: > >> From fdf8690097a236ce5799b70cf4e43ccf7e420022 Mon Sep 17 00:00:00 2001 >> From: Maxim Cournoyer >> 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 >> 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=E2=80=99. Thank you! Merged with commit b8e7e20841. Maxim From unknown Fri Jun 13 11:24:47 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 03 Oct 2019 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator