GNU bug report logs - #71263
Add additional fields to oci-container-configuration

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Package: guix-patches; Reported by: paul <goodoldpaul@HIDDEN>; Done: Zheng Junjie <zhengjunjie@HIDDEN>; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 71263-done <at> debbugs.gnu.org:


Received: (at 71263-done) by debbugs.gnu.org; 5 Jul 2024 07:42:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 05 03:42:11 2024
Received: from localhost ([127.0.0.1]:43496 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sPda7-0000XD-DB
	for submit <at> debbugs.gnu.org; Fri, 05 Jul 2024 03:42:11 -0400
Received: from smtp81.cstnet.cn ([159.226.251.81]:60040 helo=cstnet.cn)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <zhengjunjie@HIDDEN>) id 1sPda5-0000Wv-08
 for 71263-done <at> debbugs.gnu.org; Fri, 05 Jul 2024 03:42:10 -0400
Received: from m (unknown [107.174.64.25])
 by APP-03 (Coremail) with SMTP id rQCowABnbHy6o4dmrzYgFA--.58509S2;
 Fri, 05 Jul 2024 15:41:56 +0800 (CST)
From: Zheng Junjie <zhengjunjie@HIDDEN>
To: Giacomo Leidi via Guix-patches via <guix-patches@HIDDEN>
Subject: Re: [bug#71263] [PATCH v2 1/5] doc: Minor changes to the OCI-backed
 Services documentation.
In-Reply-To: <bb976d4b2da5054cf182816b7070574bee1e1e45.1718136300.git.goodoldpaul@HIDDEN>
 (Giacomo Leidi via Guix-patches via's message of "Tue, 11 Jun 2024
 22:04:56 +0200")
References: <39e6b8e8-c1df-f5fb-5e43-f238d0d4067f@HIDDEN>
 <bb976d4b2da5054cf182816b7070574bee1e1e45.1718136300.git.goodoldpaul@HIDDEN>
Date: Fri, 05 Jul 2024 15:41:44 +0800
Message-ID: <874j94i8uf.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-CM-TRANSID: rQCowABnbHy6o4dmrzYgFA--.58509S2
X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73
 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYf7k0a2IF6w4xM7kC6x804xWl14x267AK
 xVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw
 A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j
 6w1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxV
 W0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1lnx0Ee4C267I2x7xF54xIwI0E
 7I0Y6sxI4wAS0I0E0xvYzxvE52x082IY62kv0487M2AExVA0xI801c8C04v7Mc02F40EFc
 xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_
 Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcVAKI48JMxAIw28IcxkI7VAKI48JMxC20s
 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_
 JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14
 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xva
 j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JV
 W8JrUvcSsGvfC2KfnxnUUI43ZEXa7IUjYii3UUUUU==
X-Originating-IP: [107.174.64.25]
X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 71263-done
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>,
 Maxim Cournoyer <maxim.cournoyer@HIDDEN>,
 Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s?= <ludo@HIDDEN>,
 Florian Pelz <pelzflorian@HIDDEN>, 71263-done <at> debbugs.gnu.org,
 Matthew Trzcinski <matt@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable


hello, pushed with some change.

from https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3Df5d0c324b1eb11=
29a70c04487e5f112cb1838f63
to https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3D5ee2799cabba4b2d=
462ac064a98789d7bca07923

And 2-5 patch should prefix with "services: oci-container:", because this p=
atches is impove
oci-container-shepherd-service, not docker package.

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmaHo7gACgkQO1qpk+Gi
3/DFThAAuak5kpm+xz7yjUy/mZ72jcmxeYt7ScewYykl8zXN/nlH+mFFrVr+UJ14
8hdL8dgEVlwOvlnmtHjm+zuhb2cOKq8epXje7dWaUTPmY0PSQA0p2lOq5FAIlBpQ
hm/UdLHr1irtECr6uCYKt13b2YfBwGZXgMq7Ignqd3HK1Y2FHy6s5w4yQySbOQJ4
VTGRNPfrSgsSuaJPa/bdwFRtD9yx1dkYKmgCwjkHMz7MjBtoGRZyvCnnkvnmoxB3
t4isKR+SL0R+owIBQEpgrKUIf+muZqqPdHNZFyc6wEi1ee232UXbdSRXYGFswlBX
JdSFH89qwwwftRnTsbKCrQfP4z9/eOU6qcbPaUL5/lI8O0E2tpYp5EDUHFxbHoWL
akEV7bfuRWxFE7KQtgmiwtlMZrl8TMxaQosyAIvJs7HTK2xVQgu4fX/9JLuoOSvY
e3bno9osw+lCstljjGCARAahgt68pMnXXglVZYXulAywvsWd9Izki0lvaX7M5NT9
ZjSL8j3Xc65FjE536MkN1kkRM4YPNFcm4BPCMiBfRAJj4wQPLzhpEPedIK5BlhR2
gvxvMcnDfDHCxghefdt/S19synCsuwnjiPC2xwR1vxLSmv1bVLlRZ3dWM2OcfNuQ
ZXV+CIHiXDUrGzi61kVeJh7ZuYDn118uTXglK+BFv0xQx0Q8MGY=
=c9Py
-----END PGP SIGNATURE-----
--=-=-=--
Notification sent to paul <goodoldpaul@HIDDEN>:
bug acknowledged by developer. Full text available.
Reply sent to Zheng Junjie <zhengjunjie@HIDDEN>:
You have taken responsibility. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 5 Jul 2024 07:42:14 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 05 03:42:13 2024
Received: from localhost ([127.0.0.1]:43499 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sPda9-0000XS-MK
	for submit <at> debbugs.gnu.org; Fri, 05 Jul 2024 03:42:13 -0400
Received: from lists.gnu.org ([209.51.188.17]:40082)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <zhengjunjie@HIDDEN>) id 1sPda7-0000XE-KI
 for submit <at> debbugs.gnu.org; Fri, 05 Jul 2024 03:42:12 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <zhengjunjie@HIDDEN>)
 id 1sPda4-0005AR-F9
 for guix-patches@HIDDEN; Fri, 05 Jul 2024 03:42:08 -0400
Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn)
 by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256)
 (Exim 4.90_1) (envelope-from <zhengjunjie@HIDDEN>)
 id 1sPda2-0006sv-BQ; Fri, 05 Jul 2024 03:42:08 -0400
Received: from m (unknown [107.174.64.25])
 by APP-03 (Coremail) with SMTP id rQCowABnbHy6o4dmrzYgFA--.58509S2;
 Fri, 05 Jul 2024 15:41:56 +0800 (CST)
From: Zheng Junjie <zhengjunjie@HIDDEN>
To: Giacomo Leidi via Guix-patches via <guix-patches@HIDDEN>
Subject: Re: [bug#71263] [PATCH v2 1/5] doc: Minor changes to the OCI-backed
 Services documentation.
In-Reply-To: <bb976d4b2da5054cf182816b7070574bee1e1e45.1718136300.git.goodoldpaul@HIDDEN>
 (Giacomo Leidi via Guix-patches via's message of "Tue, 11 Jun 2024
 22:04:56 +0200")
References: <39e6b8e8-c1df-f5fb-5e43-f238d0d4067f@HIDDEN>
 <bb976d4b2da5054cf182816b7070574bee1e1e45.1718136300.git.goodoldpaul@HIDDEN>
Date: Fri, 05 Jul 2024 15:41:44 +0800
Message-ID: <874j94i8uf.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-CM-TRANSID: rQCowABnbHy6o4dmrzYgFA--.58509S2
X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73
 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYf7k0a2IF6w4xM7kC6x804xWl14x267AK
 xVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw
 A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j
 6w1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxV
 W0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1lnx0Ee4C267I2x7xF54xIwI0E
 7I0Y6sxI4wAS0I0E0xvYzxvE52x082IY62kv0487M2AExVA0xI801c8C04v7Mc02F40EFc
 xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_
 Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcVAKI48JMxAIw28IcxkI7VAKI48JMxC20s
 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_
 JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14
 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xva
 j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JV
 W8JrUvcSsGvfC2KfnxnUUI43ZEXa7IUjYii3UUUUU==
X-Originating-IP: [107.174.64.25]
X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/
Received-SPF: pass client-ip=159.226.251.81;
 envelope-from=zhengjunjie@HIDDEN; helo=cstnet.cn
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.4 (-)
X-Debbugs-Envelope-To: submit
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>,
 Maxim Cournoyer <maxim.cournoyer@HIDDEN>,
 Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s?= <ludo@HIDDEN>,
 Florian Pelz <pelzflorian@HIDDEN>, 71263-done <at> debbugs.gnu.org,
 Matthew Trzcinski <matt@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)

--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable


hello, pushed with some change.

from https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3Df5d0c324b1eb11=
29a70c04487e5f112cb1838f63
to https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3D5ee2799cabba4b2d=
462ac064a98789d7bca07923

And 2-5 patch should prefix with "services: oci-container:", because this p=
atches is impove
oci-container-shepherd-service, not docker package.

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmaHo7gACgkQO1qpk+Gi
3/DFThAAuak5kpm+xz7yjUy/mZ72jcmxeYt7ScewYykl8zXN/nlH+mFFrVr+UJ14
8hdL8dgEVlwOvlnmtHjm+zuhb2cOKq8epXje7dWaUTPmY0PSQA0p2lOq5FAIlBpQ
hm/UdLHr1irtECr6uCYKt13b2YfBwGZXgMq7Ignqd3HK1Y2FHy6s5w4yQySbOQJ4
VTGRNPfrSgsSuaJPa/bdwFRtD9yx1dkYKmgCwjkHMz7MjBtoGRZyvCnnkvnmoxB3
t4isKR+SL0R+owIBQEpgrKUIf+muZqqPdHNZFyc6wEi1ee232UXbdSRXYGFswlBX
JdSFH89qwwwftRnTsbKCrQfP4z9/eOU6qcbPaUL5/lI8O0E2tpYp5EDUHFxbHoWL
akEV7bfuRWxFE7KQtgmiwtlMZrl8TMxaQosyAIvJs7HTK2xVQgu4fX/9JLuoOSvY
e3bno9osw+lCstljjGCARAahgt68pMnXXglVZYXulAywvsWd9Izki0lvaX7M5NT9
ZjSL8j3Xc65FjE536MkN1kkRM4YPNFcm4BPCMiBfRAJj4wQPLzhpEPedIK5BlhR2
gvxvMcnDfDHCxghefdt/S19synCsuwnjiPC2xwR1vxLSmv1bVLlRZ3dWM2OcfNuQ
ZXV+CIHiXDUrGzi61kVeJh7ZuYDn118uTXglK+BFv0xQx0Q8MGY=
=c9Py
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded to guix-patches@HIDDEN:
bug#71263; Package guix-patches. Full text available.

Message received at 71263 <at> debbugs.gnu.org:


Received: (at 71263) by debbugs.gnu.org; 5 Jul 2024 07:36:22 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 05 03:36:22 2024
Received: from localhost ([127.0.0.1]:43470 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sPdUT-0000MS-Tf
	for submit <at> debbugs.gnu.org; Fri, 05 Jul 2024 03:36:22 -0400
Received: from smtp81.cstnet.cn ([159.226.251.81]:59042 helo=cstnet.cn)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <zhengjunjie@HIDDEN>) id 1sPdUR-0000MA-9S
 for 71263 <at> debbugs.gnu.org; Fri, 05 Jul 2024 03:36:21 -0400
Received: from m (unknown [107.174.64.25])
 by APP-03 (Coremail) with SMTP id rQCowACnrHxboodmrgcgFA--.58783S2;
 Fri, 05 Jul 2024 15:36:02 +0800 (CST)
From: Zheng Junjie <zhengjunjie@HIDDEN>
To: Giacomo Leidi via Guix-patches via <guix-patches@HIDDEN>
Subject: Re: [bug#71263] [PATCH v2 2/5] gnu: docker: Allow setting Shepherd
 log-file in oci-container-configuration.
In-Reply-To: <cebe8bfb07cbf4aabd3c91ccd657e6e04f352446.1718136300.git.goodoldpaul@HIDDEN>
 (Giacomo Leidi via Guix-patches via's message of "Tue, 11 Jun 2024
 22:04:57 +0200")
References: <bb976d4b2da5054cf182816b7070574bee1e1e45.1718136300.git.goodoldpaul@HIDDEN>
 <cebe8bfb07cbf4aabd3c91ccd657e6e04f352446.1718136300.git.goodoldpaul@HIDDEN>
Date: Fri, 05 Jul 2024 15:35:49 +0800
Message-ID: <878qygi94a.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-CM-TRANSID: rQCowACnrHxboodmrgcgFA--.58783S2
X-Coremail-Antispam: 1UD129KBjvJXoWxJw18Cr4kJry8KFW8WFW3ZFb_yoWrWryrpa
 s7u3WFg347trn8AwsYvwnY9FW3Zrn7Kry5Cw4kXa4xAF1DuFyqkr12kFnIvw4xWrs7Jr15
 XryFgF15Wr4kJaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2
 9KBjDU0xBIdaVrnRJUUUvmb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2
 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw
 A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII
 jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I
 8E87Iv6xkF7I0E14v26rxl6s0DM2vj62AExVA0xI801c8C04v26x02cVCv0xWle2I262IY
 c4CY6c8Ij28IcVAaY2xG8wASzI0EjI02j7AqF2xKxwAqx4xG64xvF2IEw4CE5I8CrVC2j2
 WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkE
 bVWUJVW8JwACjcxG0xvEwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJV
 W8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF
 1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6x
 IIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvE
 x4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnU
 UI43ZEXa7IUeqXd5UUUUU==
X-Originating-IP: [107.174.64.25]
X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 71263
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>,
 Maxim Cournoyer <maxim.cournoyer@HIDDEN>, 71263 <at> debbugs.gnu.org,
 Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s?= <ludo@HIDDEN>,
 Florian Pelz <pelzflorian@HIDDEN>,
 Matthew Trzcinski <matt@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Giacomo Leidi via Guix-patches via <guix-patches@HIDDEN> writes:

> * gnu/services/docker.scm (oci-container-configuration)
> [log-file]: New field;
> (oci-container-shepherd-service): use it.
>
> * doc/guix.texi: Document it.
>
> Change-Id: Icad29ac6342b6f5bafc0d9be13a93cee99674185
> ---
>  doc/guix.texi           |  5 +++++
>  gnu/services/docker.scm | 19 +++++++++++++++----
>  2 files changed, 20 insertions(+), 4 deletions(-)
>
> diff --git a/doc/guix.texi b/doc/guix.texi
> index 5a06d7cdc5..40296fcd5f 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -40698,6 +40698,11 @@ Miscellaneous Services
>  Set additional Shepherd services dependencies to the provisioned
>  Shepherd service.
>=20=20
> +@item @code{log-file} (default: @code{""}) (type: string)
                         ^^^^^^^^^^^^^^^^^^^^
                         i remove it, because it is not "".
> +@item @code{log-file} (default: @code{""}) (type: string)
                                                     ^^^^^^
                                                     maybe-string
> +When @code{log-file} is set, it names the file to which the service's
> +standard output and standard error are redirected.  @code{log-file} is c=
reated
> +if it does not exist, otherwise it is appended to.
> +
>  @item @code{network} (default: @code{""}) (type: string)
>  Set a Docker network for the spawned container.
>=20=20
> diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
> index cc1201508c..678e8b1139 100644
> --- a/gnu/services/docker.scm
> +++ b/gnu/services/docker.scm
> @@ -74,6 +74,7 @@ (define-module (gnu services docker)
>              oci-container-configuration-image
>              oci-container-configuration-provision
>              oci-container-configuration-requirement
> +            oci-container-configuration-log-file
>              oci-container-configuration-network
>              oci-container-configuration-ports
>              oci-container-configuration-volumes
> @@ -461,6 +462,11 @@ (define-configuration/no-serialization oci-container=
-configuration
>     (list-of-symbols '())
>     "Set additional Shepherd services dependencies to the provisioned She=
pherd
>  service.")
> +  (log-file
> +   (maybe-string)
> +   "When @code{log-file} is set, it names the file to which the service=
=E2=80=99s
> +standard output and standard error are redirected.  @code{log-file} is c=
reated
> +if it does not exist, otherwise it is appended to.")
>    (network
>     (maybe-string)
>     "Set a Docker network for the spawned container.")
> @@ -669,12 +675,16 @@ (define (oci-container-shepherd-service config)
>           (host-environment
>            (oci-container-configuration-host-environment config))
>           (command (oci-container-configuration-command config))
> +         (log-file (oci-container-configuration-log-file config))
>           (provision (oci-container-configuration-provision config))
>           (requirement (oci-container-configuration-requirement config))
>           (image (oci-container-configuration-image config))
>           (image-reference (oci-image-reference image))
>           (options (oci-container-configuration->options config))
>           (name (guess-name provision image))
> +         (loader (if (oci-image? image)
> +                     (%oci-image-loader name image image-reference)
> +                     #f))
>           (extra-arguments
>            (oci-container-configuration-extra-arguments config)))
>=20=20
> @@ -687,10 +697,8 @@ (define (oci-container-shepherd-service config)
>                          (if (oci-image? image) name image) "."))
>                        (start
>                         #~(lambda ()
> -                           #$@(if (oci-image? image)
> -                                  #~((invoke #$(%oci-image-loader
> -                                                name image image-referen=
ce)))
> -                                  #~())
> +                           (when #$(oci-image? image)
> +                             (invoke #$loader))

if (oci-image? image) return #f

```
(when #f
  (invoke #f))

```

This is noise in the file.

>                             (fork+exec-command
>                              ;; docker run [OPTIONS] IMAGE [COMMAND] [ARG=
...]
>                              (list #$docker "run" "--rm" "--name" #$name
> @@ -698,6 +706,9 @@ (define (oci-container-shepherd-service config)
>                                    #$image-reference #$@command)
>                              #:user #$user
>                              #:group #$group
> +                            #$@(if (maybe-value-set? log-file)
> +                                   (list #:log-file log-file)
> +                                   '())
>                              #:environment-variables
>                              (list #$@host-environment))))
>                        (stop

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmaHolUACgkQO1qpk+Gi
3/CtOw//Wg8loOqdgw+Q+fS3iH01hnLSaiiKS3eWIJkqgAl1P5F2xUBgKxYTQGvF
iNYrpNYcGgSKij50gjpnuyXFjU7KM+Lk0XU6fFPtSa1jisgdszRRUQTOpBgZWRu9
pgcGwe6wulldNYRlZ8cH7EwIE5VlzUlrmV+tNehbrIAtZJxHb0tD4sUC7bzlQcMb
IEFtvLmumQsakIWPBE/43DT+WFK6CZqr7NUTk+quRgBa8hujKmiZUOVAJWSo0gOU
FtJBHpSGtBJJLAgUXWreQjAShpRvVZtEZWn/diluRVZ/0Aql3wlFs87jX7qSxzMu
rZtmgXEHZV54uKDZ1bdJfBPfLnONUis68KQTIIFlUaXIo0G+rxhwS8OpJn8NWYPj
1a/wt85AoDdTSl4fr3+phxhZddtFj3MSWnpVSQfgnYdSuNfLQ91Mnh5+RZ6fiR5i
chagrimJ+/gLuQx52doKerLlIa8YSc84IIoU9GVm8sLIXN2hqQMbvDSNxfV5q4NY
a9bY2QuVHZYa2mQCuv/2GREcRUmUQd6Md18CavtzdRyOB73+aWL7oKeEPZwbKE0s
BQaGUNWlQhDo5dC9sR1T272c7gIx+6VoY/VsPSW1EVsWDn6XCOJuLQmeCXOE09ID
01tQMO/xsW9ddC13n4XjjraxMG2UcJkstY3piNQIyJiBIy7S7X0=
=g6XR
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded to guix-patches@HIDDEN:
bug#71263; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 5 Jul 2024 07:36:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jul 05 03:36:32 2024
Received: from localhost ([127.0.0.1]:43473 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sPdUe-0000Mq-FJ
	for submit <at> debbugs.gnu.org; Fri, 05 Jul 2024 03:36:32 -0400
Received: from lists.gnu.org ([209.51.188.17]:47266)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <zhengjunjie@HIDDEN>) id 1sPdUc-0000Mg-4X
 for submit <at> debbugs.gnu.org; Fri, 05 Jul 2024 03:36:30 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <zhengjunjie@HIDDEN>)
 id 1sPdUZ-0003gq-0m
 for guix-patches@HIDDEN; Fri, 05 Jul 2024 03:36:27 -0400
Received: from smtp81.cstnet.cn ([159.226.251.81] helo=cstnet.cn)
 by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256)
 (Exim 4.90_1) (envelope-from <zhengjunjie@HIDDEN>)
 id 1sPdUW-0004ws-Bb; Fri, 05 Jul 2024 03:36:26 -0400
Received: from m (unknown [107.174.64.25])
 by APP-03 (Coremail) with SMTP id rQCowACnrHxboodmrgcgFA--.58783S2;
 Fri, 05 Jul 2024 15:36:02 +0800 (CST)
From: Zheng Junjie <zhengjunjie@HIDDEN>
To: Giacomo Leidi via Guix-patches via <guix-patches@HIDDEN>
Subject: Re: [bug#71263] [PATCH v2 2/5] gnu: docker: Allow setting Shepherd
 log-file in oci-container-configuration.
In-Reply-To: <cebe8bfb07cbf4aabd3c91ccd657e6e04f352446.1718136300.git.goodoldpaul@HIDDEN>
 (Giacomo Leidi via Guix-patches via's message of "Tue, 11 Jun 2024
 22:04:57 +0200")
References: <bb976d4b2da5054cf182816b7070574bee1e1e45.1718136300.git.goodoldpaul@HIDDEN>
 <cebe8bfb07cbf4aabd3c91ccd657e6e04f352446.1718136300.git.goodoldpaul@HIDDEN>
Date: Fri, 05 Jul 2024 15:35:49 +0800
Message-ID: <878qygi94a.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-CM-TRANSID: rQCowACnrHxboodmrgcgFA--.58783S2
X-Coremail-Antispam: 1UD129KBjvJXoWxJw18Cr4kJry8KFW8WFW3ZFb_yoWrWryrpa
 s7u3WFg347trn8AwsYvwnY9FW3Zrn7Kry5Cw4kXa4xAF1DuFyqkr12kFnIvw4xWrs7Jr15
 XryFgF15Wr4kJaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2
 9KBjDU0xBIdaVrnRJUUUvmb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2
 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw
 A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII
 jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I
 8E87Iv6xkF7I0E14v26rxl6s0DM2vj62AExVA0xI801c8C04v26x02cVCv0xWle2I262IY
 c4CY6c8Ij28IcVAaY2xG8wASzI0EjI02j7AqF2xKxwAqx4xG64xvF2IEw4CE5I8CrVC2j2
 WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkE
 bVWUJVW8JwACjcxG0xvEwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJV
 W8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF
 1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6x
 IIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvE
 x4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnU
 UI43ZEXa7IUeqXd5UUUUU==
X-Originating-IP: [107.174.64.25]
X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/
Received-SPF: pass client-ip=159.226.251.81;
 envelope-from=zhengjunjie@HIDDEN; helo=cstnet.cn
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.4 (-)
X-Debbugs-Envelope-To: submit
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>,
 Maxim Cournoyer <maxim.cournoyer@HIDDEN>, 71263 <at> debbugs.gnu.org,
 Ludovic =?utf-8?Q?Court?= =?utf-8?Q?=C3=A8s?= <ludo@HIDDEN>,
 Florian Pelz <pelzflorian@HIDDEN>,
 Matthew Trzcinski <matt@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Giacomo Leidi via Guix-patches via <guix-patches@HIDDEN> writes:

> * gnu/services/docker.scm (oci-container-configuration)
> [log-file]: New field;
> (oci-container-shepherd-service): use it.
>
> * doc/guix.texi: Document it.
>
> Change-Id: Icad29ac6342b6f5bafc0d9be13a93cee99674185
> ---
>  doc/guix.texi           |  5 +++++
>  gnu/services/docker.scm | 19 +++++++++++++++----
>  2 files changed, 20 insertions(+), 4 deletions(-)
>
> diff --git a/doc/guix.texi b/doc/guix.texi
> index 5a06d7cdc5..40296fcd5f 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -40698,6 +40698,11 @@ Miscellaneous Services
>  Set additional Shepherd services dependencies to the provisioned
>  Shepherd service.
>=20=20
> +@item @code{log-file} (default: @code{""}) (type: string)
                         ^^^^^^^^^^^^^^^^^^^^
                         i remove it, because it is not "".
> +@item @code{log-file} (default: @code{""}) (type: string)
                                                     ^^^^^^
                                                     maybe-string
> +When @code{log-file} is set, it names the file to which the service's
> +standard output and standard error are redirected.  @code{log-file} is c=
reated
> +if it does not exist, otherwise it is appended to.
> +
>  @item @code{network} (default: @code{""}) (type: string)
>  Set a Docker network for the spawned container.
>=20=20
> diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
> index cc1201508c..678e8b1139 100644
> --- a/gnu/services/docker.scm
> +++ b/gnu/services/docker.scm
> @@ -74,6 +74,7 @@ (define-module (gnu services docker)
>              oci-container-configuration-image
>              oci-container-configuration-provision
>              oci-container-configuration-requirement
> +            oci-container-configuration-log-file
>              oci-container-configuration-network
>              oci-container-configuration-ports
>              oci-container-configuration-volumes
> @@ -461,6 +462,11 @@ (define-configuration/no-serialization oci-container=
-configuration
>     (list-of-symbols '())
>     "Set additional Shepherd services dependencies to the provisioned She=
pherd
>  service.")
> +  (log-file
> +   (maybe-string)
> +   "When @code{log-file} is set, it names the file to which the service=
=E2=80=99s
> +standard output and standard error are redirected.  @code{log-file} is c=
reated
> +if it does not exist, otherwise it is appended to.")
>    (network
>     (maybe-string)
>     "Set a Docker network for the spawned container.")
> @@ -669,12 +675,16 @@ (define (oci-container-shepherd-service config)
>           (host-environment
>            (oci-container-configuration-host-environment config))
>           (command (oci-container-configuration-command config))
> +         (log-file (oci-container-configuration-log-file config))
>           (provision (oci-container-configuration-provision config))
>           (requirement (oci-container-configuration-requirement config))
>           (image (oci-container-configuration-image config))
>           (image-reference (oci-image-reference image))
>           (options (oci-container-configuration->options config))
>           (name (guess-name provision image))
> +         (loader (if (oci-image? image)
> +                     (%oci-image-loader name image image-reference)
> +                     #f))
>           (extra-arguments
>            (oci-container-configuration-extra-arguments config)))
>=20=20
> @@ -687,10 +697,8 @@ (define (oci-container-shepherd-service config)
>                          (if (oci-image? image) name image) "."))
>                        (start
>                         #~(lambda ()
> -                           #$@(if (oci-image? image)
> -                                  #~((invoke #$(%oci-image-loader
> -                                                name image image-referen=
ce)))
> -                                  #~())
> +                           (when #$(oci-image? image)
> +                             (invoke #$loader))

if (oci-image? image) return #f

```
(when #f
  (invoke #f))

```

This is noise in the file.

>                             (fork+exec-command
>                              ;; docker run [OPTIONS] IMAGE [COMMAND] [ARG=
...]
>                              (list #$docker "run" "--rm" "--name" #$name
> @@ -698,6 +706,9 @@ (define (oci-container-shepherd-service config)
>                                    #$image-reference #$@command)
>                              #:user #$user
>                              #:group #$group
> +                            #$@(if (maybe-value-set? log-file)
> +                                   (list #:log-file log-file)
> +                                   '())
>                              #:environment-variables
>                              (list #$@host-environment))))
>                        (stop

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmaHolUACgkQO1qpk+Gi
3/CtOw//Wg8loOqdgw+Q+fS3iH01hnLSaiiKS3eWIJkqgAl1P5F2xUBgKxYTQGvF
iNYrpNYcGgSKij50gjpnuyXFjU7KM+Lk0XU6fFPtSa1jisgdszRRUQTOpBgZWRu9
pgcGwe6wulldNYRlZ8cH7EwIE5VlzUlrmV+tNehbrIAtZJxHb0tD4sUC7bzlQcMb
IEFtvLmumQsakIWPBE/43DT+WFK6CZqr7NUTk+quRgBa8hujKmiZUOVAJWSo0gOU
FtJBHpSGtBJJLAgUXWreQjAShpRvVZtEZWn/diluRVZ/0Aql3wlFs87jX7qSxzMu
rZtmgXEHZV54uKDZ1bdJfBPfLnONUis68KQTIIFlUaXIo0G+rxhwS8OpJn8NWYPj
1a/wt85AoDdTSl4fr3+phxhZddtFj3MSWnpVSQfgnYdSuNfLQ91Mnh5+RZ6fiR5i
chagrimJ+/gLuQx52doKerLlIa8YSc84IIoU9GVm8sLIXN2hqQMbvDSNxfV5q4NY
a9bY2QuVHZYa2mQCuv/2GREcRUmUQd6Md18CavtzdRyOB73+aWL7oKeEPZwbKE0s
BQaGUNWlQhDo5dC9sR1T272c7gIx+6VoY/VsPSW1EVsWDn6XCOJuLQmeCXOE09ID
01tQMO/xsW9ddC13n4XjjraxMG2UcJkstY3piNQIyJiBIy7S7X0=
=g6XR
-----END PGP SIGNATURE-----
--=-=-=--
Information forwarded to guix-patches@HIDDEN:
bug#71263; Package guix-patches. Full text available.

Message received at 71263 <at> debbugs.gnu.org:


Received: (at 71263) by debbugs.gnu.org; 11 Jun 2024 20:05:34 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 11 16:05:34 2024
Received: from localhost ([127.0.0.1]:36309 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sH7kL-0002Cr-J8
	for submit <at> debbugs.gnu.org; Tue, 11 Jun 2024 16:05:33 -0400
Received: from confino.investici.org ([93.190.126.19]:47731)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <goodoldpaul@HIDDEN>) id 1sH7kI-0002CO-LG
 for 71263 <at> debbugs.gnu.org; Tue, 11 Jun 2024 16:05:31 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org;
 s=stigmate; t=1718136324;
 bh=7dKif1SkjPz7v5eomWqJ0uk/i8d7BnheTxm9ZvZjlCI=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
 b=cheJ0m/h0DlppA+kDdf2mkTFAZGKaOHZ3ctN+EIRwgfPKQWWdtN/FsGsB/zlQMZdJ
 I9XgRQsS94YYKFTxXCrGpMrpDcl1DhberznTKwZI3KAOoJnE1k1dxr6IFbyu/vsHoT
 Ekd0l0oUnDL7T/tlLZp7hXtoKg5JZqsZULf1lKg8=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4VzKR83R8Rz10wW;
 Tue, 11 Jun 2024 20:05:24 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: goodoldpaul@HIDDEN) by localhost (Postfix) with
 ESMTPSA id 4VzKR82s05z10tQ; Tue, 11 Jun 2024 20:05:24 +0000 (UTC)
From: Giacomo Leidi <goodoldpaul@HIDDEN>
To: 71263 <at> debbugs.gnu.org
Subject: [PATCH v2 3/5] gnu: docker: Allow setting Shepherd auto-start? in
 oci-container-configuration.
Date: Tue, 11 Jun 2024 22:04:58 +0200
Message-ID: <eb241a410666147e06d0f85756b494bfc9f3ba5c.1718136300.git.goodoldpaul@HIDDEN>
X-Mailer: git-send-email 2.45.1
In-Reply-To: <bb976d4b2da5054cf182816b7070574bee1e1e45.1718136300.git.goodoldpaul@HIDDEN>
References: <bb976d4b2da5054cf182816b7070574bee1e1e45.1718136300.git.goodoldpaul@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Matthew Trzcinski <matt@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 71263
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

* gnu/services/docker.scm (oci-container-configuration)
[auto-start?]: New field;
(oci-container-shepherd-service): use it.

* doc/guix.texi: Document it.

Change-Id: Id093d93effbbec3e1be757f8be83cf5f62eaeda7
---
 doc/guix.texi           | 4 ++++
 gnu/services/docker.scm | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/doc/guix.texi b/doc/guix.texi
index 40296fcd5f..cc3847eadb 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -40703,6 +40703,10 @@ Miscellaneous Services
 standard output and standard error are redirected.  @code{log-file} is created
 if it does not exist, otherwise it is appended to.
 
+@item @code{auto-start?} (default: @code{#t}) (type: boolean)
+Whether this service should be started automatically by the Shepherd.  If it
+is @code{#f} the service has to be started manually with @command{herd start}.
+
 @item @code{network} (default: @code{""}) (type: string)
 Set a Docker network for the spawned container.
 
diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
index 678e8b1139..712ca14cba 100644
--- a/gnu/services/docker.scm
+++ b/gnu/services/docker.scm
@@ -75,6 +75,7 @@ (define-module (gnu services docker)
             oci-container-configuration-provision
             oci-container-configuration-requirement
             oci-container-configuration-log-file
+            oci-container-configuration-auto-start?
             oci-container-configuration-network
             oci-container-configuration-ports
             oci-container-configuration-volumes
@@ -467,6 +468,10 @@ (define-configuration/no-serialization oci-container-configuration
    "When @code{log-file} is set, it names the file to which the service’s
 standard output and standard error are redirected.  @code{log-file} is created
 if it does not exist, otherwise it is appended to.")
+  (auto-start?
+   (boolean #t)
+   "Whether this service should be started automatically by the Shepherd.  If it
+is @code{#f} the service has to be started manually with @command{herd start}.")
   (network
    (maybe-string)
    "Set a Docker network for the spawned container.")
@@ -670,6 +675,8 @@ (define (oci-container-shepherd-service config)
                             (oci-image-repository image))))))
 
   (let* ((docker (file-append docker-cli "/bin/docker"))
+         (auto-start?
+          (oci-container-configuration-auto-start? config))
          (user (oci-container-configuration-user config))
          (group (oci-container-configuration-group config))
          (host-environment
@@ -691,6 +698,7 @@ (define (oci-container-shepherd-service config)
     (shepherd-service (provision `(,(string->symbol name)))
                       (requirement `(dockerd user-processes ,@requirement))
                       (respawn? #f)
+                      (auto-start? auto-start?)
                       (documentation
                        (string-append
                         "Docker backed Shepherd service for "
-- 
2.45.1
Information forwarded to pelzflorian@HIDDEN, ludo@HIDDEN, matt@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:
bug#71263; Package guix-patches. Full text available.

Message received at 71263 <at> debbugs.gnu.org:


Received: (at 71263) by debbugs.gnu.org; 11 Jun 2024 20:05:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 11 16:05:33 2024
Received: from localhost ([127.0.0.1]:36307 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sH7kL-0002Cj-4T
	for submit <at> debbugs.gnu.org; Tue, 11 Jun 2024 16:05:33 -0400
Received: from confino.investici.org ([93.190.126.19]:65301)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <goodoldpaul@HIDDEN>) id 1sH7kI-0002CM-Cy
 for 71263 <at> debbugs.gnu.org; Tue, 11 Jun 2024 16:05:30 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org;
 s=stigmate; t=1718136324;
 bh=GNgKLWlU/HcuCjhgRALwYBI0uuPpljlbsvUvN5K46IA=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
 b=o+H1M6uM52j6v4VzOHIEZ7CjuX6JAVat2+YlULpPgFaKwg24XrLUYHmP9+/xH1Mzx
 LVYEdBtR6DE6fEVQPqUuv2jFYUx+6bj+R+M+MiJTBIt5pxeddrHW9acBxrbMZbhJSW
 fkMue75lX3qcXgh0PoY0ONFv6isQ/yzW/6NOs2/U=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4VzKR81R4jz10wQ;
 Tue, 11 Jun 2024 20:05:24 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: goodoldpaul@HIDDEN) by localhost (Postfix) with
 ESMTPSA id 4VzKR80w2rz10tQ; Tue, 11 Jun 2024 20:05:24 +0000 (UTC)
From: Giacomo Leidi <goodoldpaul@HIDDEN>
To: 71263 <at> debbugs.gnu.org
Subject: [PATCH v2 2/5] gnu: docker: Allow setting Shepherd log-file in
 oci-container-configuration.
Date: Tue, 11 Jun 2024 22:04:57 +0200
Message-ID: <cebe8bfb07cbf4aabd3c91ccd657e6e04f352446.1718136300.git.goodoldpaul@HIDDEN>
X-Mailer: git-send-email 2.45.1
In-Reply-To: <bb976d4b2da5054cf182816b7070574bee1e1e45.1718136300.git.goodoldpaul@HIDDEN>
References: <bb976d4b2da5054cf182816b7070574bee1e1e45.1718136300.git.goodoldpaul@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Matthew Trzcinski <matt@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 71263
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

* gnu/services/docker.scm (oci-container-configuration)
[log-file]: New field;
(oci-container-shepherd-service): use it.

* doc/guix.texi: Document it.

Change-Id: Icad29ac6342b6f5bafc0d9be13a93cee99674185
---
 doc/guix.texi           |  5 +++++
 gnu/services/docker.scm | 19 +++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 5a06d7cdc5..40296fcd5f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -40698,6 +40698,11 @@ Miscellaneous Services
 Set additional Shepherd services dependencies to the provisioned
 Shepherd service.
 
+@item @code{log-file} (default: @code{""}) (type: string)
+When @code{log-file} is set, it names the file to which the service's
+standard output and standard error are redirected.  @code{log-file} is created
+if it does not exist, otherwise it is appended to.
+
 @item @code{network} (default: @code{""}) (type: string)
 Set a Docker network for the spawned container.
 
diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
index cc1201508c..678e8b1139 100644
--- a/gnu/services/docker.scm
+++ b/gnu/services/docker.scm
@@ -74,6 +74,7 @@ (define-module (gnu services docker)
             oci-container-configuration-image
             oci-container-configuration-provision
             oci-container-configuration-requirement
+            oci-container-configuration-log-file
             oci-container-configuration-network
             oci-container-configuration-ports
             oci-container-configuration-volumes
@@ -461,6 +462,11 @@ (define-configuration/no-serialization oci-container-configuration
    (list-of-symbols '())
    "Set additional Shepherd services dependencies to the provisioned Shepherd
 service.")
+  (log-file
+   (maybe-string)
+   "When @code{log-file} is set, it names the file to which the service’s
+standard output and standard error are redirected.  @code{log-file} is created
+if it does not exist, otherwise it is appended to.")
   (network
    (maybe-string)
    "Set a Docker network for the spawned container.")
@@ -669,12 +675,16 @@ (define (oci-container-shepherd-service config)
          (host-environment
           (oci-container-configuration-host-environment config))
          (command (oci-container-configuration-command config))
+         (log-file (oci-container-configuration-log-file config))
          (provision (oci-container-configuration-provision config))
          (requirement (oci-container-configuration-requirement config))
          (image (oci-container-configuration-image config))
          (image-reference (oci-image-reference image))
          (options (oci-container-configuration->options config))
          (name (guess-name provision image))
+         (loader (if (oci-image? image)
+                     (%oci-image-loader name image image-reference)
+                     #f))
          (extra-arguments
           (oci-container-configuration-extra-arguments config)))
 
@@ -687,10 +697,8 @@ (define (oci-container-shepherd-service config)
                         (if (oci-image? image) name image) "."))
                       (start
                        #~(lambda ()
-                           #$@(if (oci-image? image)
-                                  #~((invoke #$(%oci-image-loader
-                                                name image image-reference)))
-                                  #~())
+                           (when #$(oci-image? image)
+                             (invoke #$loader))
                            (fork+exec-command
                             ;; docker run [OPTIONS] IMAGE [COMMAND] [ARG...]
                             (list #$docker "run" "--rm" "--name" #$name
@@ -698,6 +706,9 @@ (define (oci-container-shepherd-service config)
                                   #$image-reference #$@command)
                             #:user #$user
                             #:group #$group
+                            #$@(if (maybe-value-set? log-file)
+                                   (list #:log-file log-file)
+                                   '())
                             #:environment-variables
                             (list #$@host-environment))))
                       (stop
-- 
2.45.1
Information forwarded to pelzflorian@HIDDEN, ludo@HIDDEN, matt@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:
bug#71263; Package guix-patches. Full text available.

Message received at 71263 <at> debbugs.gnu.org:


Received: (at 71263) by debbugs.gnu.org; 11 Jun 2024 20:05:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 11 16:05:33 2024
Received: from localhost ([127.0.0.1]:36305 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sH7kK-0002Ch-MS
	for submit <at> debbugs.gnu.org; Tue, 11 Jun 2024 16:05:33 -0400
Received: from confino.investici.org ([93.190.126.19]:64077)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <goodoldpaul@HIDDEN>) id 1sH7kI-0002CL-6E
 for 71263 <at> debbugs.gnu.org; Tue, 11 Jun 2024 16:05:30 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org;
 s=stigmate; t=1718136323;
 bh=45Ajyebs4mIZo4WlVstmdCYlMPKF63fbAv2wLDec1g8=;
 h=From:To:Cc:Subject:Date:From;
 b=ZD/sOadsPBG6FpN/lsV8zm9DmKGvu6JLMssh2r+b+X/+22f7XYfm6j+fG43zfRbQt
 2hqNuZMcO0zK4jDrNGzW7hZ6/eDvZq7WdBCDXK0HJTbsnhqWUMmX2w1Gtoy5+SvdjS
 KLglQZkSgT5cofmvEvYu6MkwY6ad3+oMvs0yFxC4=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4VzKR76kNWz10wK;
 Tue, 11 Jun 2024 20:05:23 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: goodoldpaul@HIDDEN) by localhost (Postfix) with
 ESMTPSA id 4VzKR763VQz10tQ; Tue, 11 Jun 2024 20:05:23 +0000 (UTC)
From: Giacomo Leidi <goodoldpaul@HIDDEN>
To: 71263 <at> debbugs.gnu.org
Subject: [PATCH v2 1/5] doc: Minor changes to the OCI-backed Services
 documentation.
Date: Tue, 11 Jun 2024 22:04:56 +0200
Message-ID: <bb976d4b2da5054cf182816b7070574bee1e1e45.1718136300.git.goodoldpaul@HIDDEN>
X-Mailer: git-send-email 2.45.1
MIME-Version: 1.0
X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Matthew Trzcinski <matt@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 71263
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

* doc/guix.texi: Clarify the example and remove reduntant escapes.

Change-Id: I38f5517ae46b391ba21ae5a94c6dcc272e245036
---
 doc/guix.texi | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 769ca1399f..5a06d7cdc5 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -40601,6 +40601,7 @@ Miscellaneous Services
 (service oci-container-service-type
          (list
           (oci-container-configuration
+           (network "host")
            (image
             (oci-image
              (repository "guile")
@@ -40613,20 +40614,17 @@ Miscellaneous Services
             '("-c" "(display \"hello!\n\")")))
           (oci-container-configuration
            (image "prom/prometheus")
-           (network "host")
            (ports
              '(("9000" . "9000")
                ("9090" . "9090"))))
           (oci-container-configuration
            (image "grafana/grafana:10.0.1")
            (network "host")
-           (ports
-             '(("3000" . "3000")))
            (volumes
              '("/var/lib/grafana:/var/lib/grafana")))))
 @end lisp
 
-In this example two different Shepherd services are going be added to the
+In this example three different Shepherd services are going be added to the
 system.  Each @code{oci-container-configuration} record translates to a
 @code{docker run} invocation and its fields directly map to options.  You can
 refer to the
@@ -40634,8 +40632,8 @@ Miscellaneous Services
 documentation for the semantics of each value.  If the images are not found they
 will be
 @url{https://docs.docker.com/engine/reference/commandline/pull/,pulled}.  The
-spawned services are going to be attached to the host network and are supposed
-to behave like other processes.
+services with @code{(network "host")} are going to be attached to the host network
+and are supposed to behave like native processes with regard to networking.
 
 @end defvar
 
@@ -40667,8 +40665,8 @@ Miscellaneous Services
 value can be a list of pairs or strings, even mixed:
 
 @lisp
-(list '(\"LANGUAGE\" . \"eo:ca:eu\")
-      \"JAVA_HOME=/opt/java\")
+(list '("LANGUAGE\" . "eo:ca:eu")
+      "JAVA_HOME=/opt/java")
 @end lisp
 
 Pair members can be strings, gexps or file-like objects. Strings are passed

base-commit: df5648daa1a5d097a430131bbff353b865b476b6
-- 
2.45.1
Information forwarded to pelzflorian@HIDDEN, ludo@HIDDEN, matt@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:
bug#71263; Package guix-patches. Full text available.

Message received at 71263 <at> debbugs.gnu.org:


Received: (at 71263) by debbugs.gnu.org; 11 Jun 2024 20:05:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 11 16:05:26 2024
Received: from localhost ([127.0.0.1]:36300 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sH7kE-0002C3-6Z
	for submit <at> debbugs.gnu.org; Tue, 11 Jun 2024 16:05:26 -0400
Received: from confino.investici.org ([93.190.126.19]:26009)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <goodoldpaul@HIDDEN>) id 1sH7kC-0002Bo-2c
 for 71263 <at> debbugs.gnu.org; Tue, 11 Jun 2024 16:05:24 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org;
 s=stigmate; t=1718136325;
 bh=fmYH3Qz2w1TJ07lokji4LKAhJYCDQy73hUhBV01GlBo=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
 b=WMFf5WzIObSZ9Ei/DapTwk1OmDlsHo6P2gSY2CHcILpVdD8EwTW0S9wPJq1onPxXs
 fvrEuOSavA3TfkuipfJFZOTjgazf3NQTF51aMdvyScav9iDNJ906Tc7lbkvpwLS3Sh
 eUzqrVycialZG5Nsspg/ML90uR6ITP60UA2cxJ1g=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4VzKR90NLTz10wj;
 Tue, 11 Jun 2024 20:05:25 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: goodoldpaul@HIDDEN) by localhost (Postfix) with
 ESMTPSA id 4VzKR86xkmz10tQ; Tue, 11 Jun 2024 20:05:24 +0000 (UTC)
From: Giacomo Leidi <goodoldpaul@HIDDEN>
To: 71263 <at> debbugs.gnu.org
Subject: [PATCH v2 5/5] gnu: docker: Allow setting Shepherd actions in
 oci-container-configuration.
Date: Tue, 11 Jun 2024 22:05:00 +0200
Message-ID: <fe85fac13179f2ea71781de31fa6b9e4faab072b.1718136300.git.goodoldpaul@HIDDEN>
X-Mailer: git-send-email 2.45.1
In-Reply-To: <bb976d4b2da5054cf182816b7070574bee1e1e45.1718136300.git.goodoldpaul@HIDDEN>
References: <bb976d4b2da5054cf182816b7070574bee1e1e45.1718136300.git.goodoldpaul@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Matthew Trzcinski <matt@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 71263
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

* gnu/services/docker.scm (oci-container-configuration)
[shepherd-actions]: New field;
(sanitize-shepherd-actions): sanitize it;
(oci-container-shepherd-service): use it.

* doc/guix.texi: Document it.

Change-Id: I0ca9826542be7cb8ca280a07a9bff1a262c2a8a7
---
 doc/guix.texi           |  4 ++++
 gnu/services/docker.scm | 38 +++++++++++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 6dae5939d5..fd49ab860e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -40711,6 +40711,10 @@ Miscellaneous Services
 Whether to have Shepherd restart the service when it stops, for instance when
 the underlying process dies.
 
+@item @code{shepherd-actions} (default: @code{'()}) (type: list-of-symbols)
+This is a list of @code{shepherd-action} records defining actions supported
+by the service.
+
 @item @code{network} (default: @code{""}) (type: string)
 Set a Docker network for the spawned container.
 
diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
index bc566e6316..78d7e2f04e 100644
--- a/gnu/services/docker.scm
+++ b/gnu/services/docker.scm
@@ -77,6 +77,7 @@ (define-module (gnu services docker)
             oci-container-configuration-log-file
             oci-container-configuration-auto-start?
             oci-container-configuration-respawn?
+            oci-container-configuration-shepherd-actions
             oci-container-configuration-network
             oci-container-configuration-ports
             oci-container-configuration-volumes
@@ -328,6 +329,17 @@ (define (oci-sanitize-volumes value)
   ;; '(("/mnt/dir" . "/dir") "/run/current-system/profile:/java")
   (oci-sanitize-mixed-list "volumes" value ":"))
 
+(define (oci-sanitize-shepherd-actions value)
+  (map
+   (lambda (el)
+     (if (shepherd-action? el)
+         el
+         (raise
+          (formatted-message
+           (G_ "shepherd-actions may only be shepherd-action records
+but ~a was found") el))))
+   value))
+
 (define (oci-sanitize-extra-arguments value)
   (define (valid? member)
     (or (string? member)
@@ -477,6 +489,11 @@ (define-configuration/no-serialization oci-container-configuration
    (boolean #f)
    "Whether to restart the service when it stops, for instance when the
 underlying process dies.")
+  (shepherd-actions
+   (list '())
+   "This is a list of @code{shepherd-action} records defining actions supported
+by the service."
+   (sanitizer oci-sanitize-shepherd-actions))
   (network
    (maybe-string)
    "Set a Docker network for the spawned container.")
@@ -680,6 +697,7 @@ (define (oci-container-shepherd-service config)
                             (oci-image-repository image))))))
 
   (let* ((docker (file-append docker-cli "/bin/docker"))
+         (actions (oci-container-configuration-shepherd-actions config))
          (auto-start?
           (oci-container-configuration-auto-start? config))
          (user (oci-container-configuration-user config))
@@ -732,15 +750,17 @@ (define (oci-container-shepherd-service config)
                       (actions
                        (if (oci-image? image)
                            '()
-                           (list
-                            (shepherd-action
-                             (name 'pull)
-                             (documentation
-                              (format #f "Pull ~a's image (~a)."
-                                      name image))
-                             (procedure
-                              #~(lambda _
-                                  (invoke #$docker "pull" #$image))))))))))
+                           (append
+                            (list
+                             (shepherd-action
+                              (name 'pull)
+                              (documentation
+                               (format #f "Pull ~a's image (~a)."
+                                       name image))
+                              (procedure
+                               #~(lambda _
+                                   (invoke #$docker "pull" #$image)))))
+                            actions))))))
 
 (define %oci-container-accounts
   (list (user-account
-- 
2.45.1
Information forwarded to pelzflorian@HIDDEN, ludo@HIDDEN, matt@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:
bug#71263; Package guix-patches. Full text available.

Message received at 71263 <at> debbugs.gnu.org:


Received: (at 71263) by debbugs.gnu.org; 11 Jun 2024 20:05:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 11 16:05:26 2024
Received: from localhost ([127.0.0.1]:36298 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sH7kD-0002C1-OW
	for submit <at> debbugs.gnu.org; Tue, 11 Jun 2024 16:05:26 -0400
Received: from confino.investici.org ([93.190.126.19]:31999)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <goodoldpaul@HIDDEN>) id 1sH7kB-0002Bm-Sw
 for 71263 <at> debbugs.gnu.org; Tue, 11 Jun 2024 16:05:24 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org;
 s=stigmate; t=1718136324;
 bh=nIufc5RoB2ZlJjQN7afkNEQv6LwbpgSdllOAzuohPgc=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
 b=fNEYJz2U6GcnGo8ErvH4RExlUXz3wDuHqcvEur0mEEuCuD+Fja2h8KJsp5VZXzHdo
 2oKbSWLKrQ/2D3wLTqBRHWgoRTbdE/usYDuAkgbXm5sXKoQVsiInq6kdrCogBC9d5r
 NBr01KvfGuCwJHXnTx4xNsDyGuVNbK6MFDWUJ0QU=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4VzKR85ZCDz10wc;
 Tue, 11 Jun 2024 20:05:24 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: goodoldpaul@HIDDEN) by localhost (Postfix) with
 ESMTPSA id 4VzKR84mkjz10tQ; Tue, 11 Jun 2024 20:05:24 +0000 (UTC)
From: Giacomo Leidi <goodoldpaul@HIDDEN>
To: 71263 <at> debbugs.gnu.org
Subject: [PATCH v2 4/5] gnu: docker: Allow setting Shepherd respawn? in
 oci-container-configuration.
Date: Tue, 11 Jun 2024 22:04:59 +0200
Message-ID: <254aa172b9db717f80cfbc6ff6db61197116316f.1718136300.git.goodoldpaul@HIDDEN>
X-Mailer: git-send-email 2.45.1
In-Reply-To: <bb976d4b2da5054cf182816b7070574bee1e1e45.1718136300.git.goodoldpaul@HIDDEN>
References: <bb976d4b2da5054cf182816b7070574bee1e1e45.1718136300.git.goodoldpaul@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Matthew Trzcinski <matt@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 71263
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

* gnu/services/docker.scm (oci-container-configuration)
[respawn?]: New field;
(oci-container-shepherd-service): use it.

* doc/guix.texi: Document it.

Change-Id: I0d6367607fd0fd41f90a54b33d80bf4d4f43dd8b
---
 doc/guix.texi           | 4 ++++
 gnu/services/docker.scm | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index cc3847eadb..6dae5939d5 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -40707,6 +40707,10 @@ Miscellaneous Services
 Whether this service should be started automatically by the Shepherd.  If it
 is @code{#f} the service has to be started manually with @command{herd start}.
 
+@item @code{respawn?} (default: @code{#f}) (type: boolean)
+Whether to have Shepherd restart the service when it stops, for instance when
+the underlying process dies.
+
 @item @code{network} (default: @code{""}) (type: string)
 Set a Docker network for the spawned container.
 
diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
index 712ca14cba..bc566e6316 100644
--- a/gnu/services/docker.scm
+++ b/gnu/services/docker.scm
@@ -76,6 +76,7 @@ (define-module (gnu services docker)
             oci-container-configuration-requirement
             oci-container-configuration-log-file
             oci-container-configuration-auto-start?
+            oci-container-configuration-respawn?
             oci-container-configuration-network
             oci-container-configuration-ports
             oci-container-configuration-volumes
@@ -472,6 +473,10 @@ (define-configuration/no-serialization oci-container-configuration
    (boolean #t)
    "Whether this service should be started automatically by the Shepherd.  If it
 is @code{#f} the service has to be started manually with @command{herd start}.")
+  (respawn?
+   (boolean #f)
+   "Whether to restart the service when it stops, for instance when the
+underlying process dies.")
   (network
    (maybe-string)
    "Set a Docker network for the spawned container.")
@@ -685,6 +690,8 @@ (define (oci-container-shepherd-service config)
          (log-file (oci-container-configuration-log-file config))
          (provision (oci-container-configuration-provision config))
          (requirement (oci-container-configuration-requirement config))
+         (respawn?
+          (oci-container-configuration-respawn? config))
          (image (oci-container-configuration-image config))
          (image-reference (oci-image-reference image))
          (options (oci-container-configuration->options config))
@@ -697,7 +704,7 @@ (define (oci-container-shepherd-service config)
 
     (shepherd-service (provision `(,(string->symbol name)))
                       (requirement `(dockerd user-processes ,@requirement))
-                      (respawn? #f)
+                      (respawn? respawn?)
                       (auto-start? auto-start?)
                       (documentation
                        (string-append
-- 
2.45.1
Information forwarded to pelzflorian@HIDDEN, ludo@HIDDEN, matt@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:
bug#71263; Package guix-patches. Full text available.

Message received at 71263 <at> debbugs.gnu.org:


Received: (at 71263) by debbugs.gnu.org; 11 Jun 2024 20:02:07 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 11 16:02:07 2024
Received: from localhost ([127.0.0.1]:36283 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sH7h0-00025x-R0
	for submit <at> debbugs.gnu.org; Tue, 11 Jun 2024 16:02:07 -0400
Received: from confino.investici.org ([93.190.126.19]:48399)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <goodoldpaul@HIDDEN>) id 1sH7gy-00025n-Um
 for 71263 <at> debbugs.gnu.org; Tue, 11 Jun 2024 16:02:05 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org;
 s=stigmate; t=1718136117;
 bh=rVdpHDOzkyRbBtfrbD5qodMydubqqxDeyTdCAgExA9E=;
 h=Date:To:Cc:From:Subject:From;
 b=m5Xs5vKP9U1FVwFPfIhNxndvPzX3NWWOy4XM9nZNkzlMNzIetDwm5BpoD9Jad+Ukq
 1k2CwROYhgcQyvGVcmXX1FcT7+RwzNku0RTuPbDi3q8fdZpGZFAnwcyCdZBc+SPI+W
 qQ0ZT+9G+kK+CvwWGmE7ruZ0L8NKhdad2PoYFOe8=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4VzKM96xCnz10wK;
 Tue, 11 Jun 2024 20:01:57 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: goodoldpaul@HIDDEN) by localhost (Postfix) with
 ESMTPSA id 4VzKM95tRkz10w5; Tue, 11 Jun 2024 20:01:57 +0000 (UTC)
Message-ID: <1ab8442f-4e90-d186-6725-c17df0516453@HIDDEN>
Date: Tue, 11 Jun 2024 22:01:57 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.0
Content-Language: en-US
To: 71263 <at> debbugs.gnu.org
From: paul <goodoldpaul@HIDDEN>
Subject: [PATCH v2] Add additional fields to oci-container-configuration -
 Rebase on current master
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 71263
Cc: =?UTF-8?Q?Ludovic_Court=c3=a8s?= <ludo@HIDDEN>, maxim.cournoyer@HIDDEN,
 pelzflorian@HIDDEN, matt@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

Hello Guixers,

I'm sending an updated patchset, rebased on current master.

Thank you for your work,


giacomo
Information forwarded to guix-patches@HIDDEN:
bug#71263; Package guix-patches. Full text available.

Message received at 71263 <at> debbugs.gnu.org:


Received: (at 71263) by debbugs.gnu.org; 29 May 2024 21:39:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 29 17:39:37 2024
Received: from localhost ([127.0.0.1]:55977 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sCR1F-0008BY-DC
	for submit <at> debbugs.gnu.org; Wed, 29 May 2024 17:39:37 -0400
Received: from confino.investici.org ([93.190.126.19]:27333)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <goodoldpaul@HIDDEN>) id 1sCR19-0008Af-7y
 for 71263 <at> debbugs.gnu.org; Wed, 29 May 2024 17:39:32 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org;
 s=stigmate; t=1717018753;
 bh=dYNFlJvCIPj1IpiBTm/0Bkd4FI18jAmcFmPwVBTWp30=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
 b=rUshopFwlaSCxA9ajS0wwwnuzUPjeYzVq6EmoFc5CKeTS1Qu0eMZ1fLZaAb8op+W2
 3o/haFBFeftmOFEj2Pg8dBc17NVOJl7cM85ZbVLKib2sT51co2SuA1EpqaHlD0B/a8
 sgRYgW4mmRWVJNiOfz39r84xS4SKp3zBxVFDfiWs=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4VqN7P2lB1z1117;
 Wed, 29 May 2024 21:39:13 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: goodoldpaul@HIDDEN) by localhost (Postfix) with
 ESMTPSA id 4VqN7P2C32z110x; Wed, 29 May 2024 21:39:13 +0000 (UTC)
From: Giacomo Leidi <goodoldpaul@HIDDEN>
To: 71263 <at> debbugs.gnu.org
Subject: [PATCH 5/5] gnu: docker: Allow setting Shepherd actions in
 oci-container-configuration.
Date: Wed, 29 May 2024 23:38:56 +0200
Message-ID: <b0792925cbf00ee18b6acdf97b74813bceef6d28.1717018736.git.goodoldpaul@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <31ff6a93a8c7b50e5152f75b091b28851d5c4cc8.1717018735.git.goodoldpaul@HIDDEN>
References: <31ff6a93a8c7b50e5152f75b091b28851d5c4cc8.1717018735.git.goodoldpaul@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Matthew Trzcinski <matt@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 71263
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

* gnu/services/docker.scm (oci-container-configuration)
[shepherd-actions]: New field;
(sanitize-shepherd-actions): sanitize it;
(oci-container-shepherd-service): use it.

Change-Id: I0ca9826542be7cb8ca280a07a9bff1a262c2a8a7
---
 doc/guix.texi           |  4 ++++
 gnu/services/docker.scm | 38 +++++++++++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 9abdc77869..4c137ee31e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -40657,6 +40657,10 @@ Miscellaneous Services
 Whether to have Shepherd restart the service when it stops, for instance when
 the underlying process dies.
 
+@item @code{shepherd-actions} (default: @code{'()}) (type: list-of-symbols)
+This is a list of @code{shepherd-action} records defining actions supported
+by the service.
+
 @item @code{network} (default: @code{""}) (type: string)
 Set a Docker network for the spawned container.
 
diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
index bc566e6316..78d7e2f04e 100644
--- a/gnu/services/docker.scm
+++ b/gnu/services/docker.scm
@@ -77,6 +77,7 @@ (define-module (gnu services docker)
             oci-container-configuration-log-file
             oci-container-configuration-auto-start?
             oci-container-configuration-respawn?
+            oci-container-configuration-shepherd-actions
             oci-container-configuration-network
             oci-container-configuration-ports
             oci-container-configuration-volumes
@@ -328,6 +329,17 @@ (define (oci-sanitize-volumes value)
   ;; '(("/mnt/dir" . "/dir") "/run/current-system/profile:/java")
   (oci-sanitize-mixed-list "volumes" value ":"))
 
+(define (oci-sanitize-shepherd-actions value)
+  (map
+   (lambda (el)
+     (if (shepherd-action? el)
+         el
+         (raise
+          (formatted-message
+           (G_ "shepherd-actions may only be shepherd-action records
+but ~a was found") el))))
+   value))
+
 (define (oci-sanitize-extra-arguments value)
   (define (valid? member)
     (or (string? member)
@@ -477,6 +489,11 @@ (define-configuration/no-serialization oci-container-configuration
    (boolean #f)
    "Whether to restart the service when it stops, for instance when the
 underlying process dies.")
+  (shepherd-actions
+   (list '())
+   "This is a list of @code{shepherd-action} records defining actions supported
+by the service."
+   (sanitizer oci-sanitize-shepherd-actions))
   (network
    (maybe-string)
    "Set a Docker network for the spawned container.")
@@ -680,6 +697,7 @@ (define (oci-container-shepherd-service config)
                             (oci-image-repository image))))))
 
   (let* ((docker (file-append docker-cli "/bin/docker"))
+         (actions (oci-container-configuration-shepherd-actions config))
          (auto-start?
           (oci-container-configuration-auto-start? config))
          (user (oci-container-configuration-user config))
@@ -732,15 +750,17 @@ (define (oci-container-shepherd-service config)
                       (actions
                        (if (oci-image? image)
                            '()
-                           (list
-                            (shepherd-action
-                             (name 'pull)
-                             (documentation
-                              (format #f "Pull ~a's image (~a)."
-                                      name image))
-                             (procedure
-                              #~(lambda _
-                                  (invoke #$docker "pull" #$image))))))))))
+                           (append
+                            (list
+                             (shepherd-action
+                              (name 'pull)
+                              (documentation
+                               (format #f "Pull ~a's image (~a)."
+                                       name image))
+                              (procedure
+                               #~(lambda _
+                                   (invoke #$docker "pull" #$image)))))
+                            actions))))))
 
 (define %oci-container-accounts
   (list (user-account
-- 
2.41.0
Information forwarded to pelzflorian@HIDDEN, ludo@HIDDEN, matt@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:
bug#71263; Package guix-patches. Full text available.

Message received at 71263 <at> debbugs.gnu.org:


Received: (at 71263) by debbugs.gnu.org; 29 May 2024 21:39:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 29 17:39:37 2024
Received: from localhost ([127.0.0.1]:55975 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sCR1E-0008BP-W6
	for submit <at> debbugs.gnu.org; Wed, 29 May 2024 17:39:37 -0400
Received: from confino.investici.org ([93.190.126.19]:65325)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <goodoldpaul@HIDDEN>) id 1sCR18-0008Ae-VX
 for 71263 <at> debbugs.gnu.org; Wed, 29 May 2024 17:39:31 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org;
 s=stigmate; t=1717018753;
 bh=eZhzPJEy3x83M2TJUQ+npHboyeD6jAJdPdkmO9YBH80=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
 b=usFSn410w/S3gKZCVbR6q6VLSUEE5r/t5dnZd88IEdcPjC35UoWMUsK9lTzdO0rsK
 gsmzTukVNC466z+BLfbxDzWfa1QU54KufCC0aS6o2pG+2+V/ZoYxge34I2nrYEFdef
 F9tYUfSmZWv72W2TZRtffcwHTAWC9HQ+qDEKmJi0=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4VqN7P0vTLz1116;
 Wed, 29 May 2024 21:39:13 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: goodoldpaul@HIDDEN) by localhost (Postfix) with
 ESMTPSA id 4VqN7P0LFLz110x; Wed, 29 May 2024 21:39:13 +0000 (UTC)
From: Giacomo Leidi <goodoldpaul@HIDDEN>
To: 71263 <at> debbugs.gnu.org
Subject: [PATCH 4/5] gnu: docker: Allow setting Shepherd respawn? in
 oci-container-configuration.
Date: Wed, 29 May 2024 23:38:55 +0200
Message-ID: <4e9095471f8157305cb7b0e26cacd6580de344c2.1717018736.git.goodoldpaul@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <31ff6a93a8c7b50e5152f75b091b28851d5c4cc8.1717018735.git.goodoldpaul@HIDDEN>
References: <31ff6a93a8c7b50e5152f75b091b28851d5c4cc8.1717018735.git.goodoldpaul@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Matthew Trzcinski <matt@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 71263
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

* gnu/services/docker.scm (oci-container-configuration)
[respawn?]: New field;
(oci-container-shepherd-service): use it.

Change-Id: I0d6367607fd0fd41f90a54b33d80bf4d4f43dd8b
---
 doc/guix.texi           | 4 ++++
 gnu/services/docker.scm | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index dfc4d65349..9abdc77869 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -40653,6 +40653,10 @@ Miscellaneous Services
 Whether this service should be started automatically by the Shepherd.  If it
 is @code{#f} the service has to be started manually with @command{herd start}.
 
+@item @code{respawn?} (default: @code{#f}) (type: boolean)
+Whether to have Shepherd restart the service when it stops, for instance when
+the underlying process dies.
+
 @item @code{network} (default: @code{""}) (type: string)
 Set a Docker network for the spawned container.
 
diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
index 712ca14cba..bc566e6316 100644
--- a/gnu/services/docker.scm
+++ b/gnu/services/docker.scm
@@ -76,6 +76,7 @@ (define-module (gnu services docker)
             oci-container-configuration-requirement
             oci-container-configuration-log-file
             oci-container-configuration-auto-start?
+            oci-container-configuration-respawn?
             oci-container-configuration-network
             oci-container-configuration-ports
             oci-container-configuration-volumes
@@ -472,6 +473,10 @@ (define-configuration/no-serialization oci-container-configuration
    (boolean #t)
    "Whether this service should be started automatically by the Shepherd.  If it
 is @code{#f} the service has to be started manually with @command{herd start}.")
+  (respawn?
+   (boolean #f)
+   "Whether to restart the service when it stops, for instance when the
+underlying process dies.")
   (network
    (maybe-string)
    "Set a Docker network for the spawned container.")
@@ -685,6 +690,8 @@ (define (oci-container-shepherd-service config)
          (log-file (oci-container-configuration-log-file config))
          (provision (oci-container-configuration-provision config))
          (requirement (oci-container-configuration-requirement config))
+         (respawn?
+          (oci-container-configuration-respawn? config))
          (image (oci-container-configuration-image config))
          (image-reference (oci-image-reference image))
          (options (oci-container-configuration->options config))
@@ -697,7 +704,7 @@ (define (oci-container-shepherd-service config)
 
     (shepherd-service (provision `(,(string->symbol name)))
                       (requirement `(dockerd user-processes ,@requirement))
-                      (respawn? #f)
+                      (respawn? respawn?)
                       (auto-start? auto-start?)
                       (documentation
                        (string-append
-- 
2.41.0
Information forwarded to pelzflorian@HIDDEN, ludo@HIDDEN, matt@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:
bug#71263; Package guix-patches. Full text available.

Message received at 71263 <at> debbugs.gnu.org:


Received: (at 71263) by debbugs.gnu.org; 29 May 2024 21:39:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 29 17:39:37 2024
Received: from localhost ([127.0.0.1]:55973 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sCR1E-0008BN-E0
	for submit <at> debbugs.gnu.org; Wed, 29 May 2024 17:39:36 -0400
Received: from confino.investici.org ([93.190.126.19]:55747)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <goodoldpaul@HIDDEN>) id 1sCR18-0008Ad-NQ
 for 71263 <at> debbugs.gnu.org; Wed, 29 May 2024 17:39:31 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org;
 s=stigmate; t=1717018752;
 bh=KPj89O7qluay/kshsG9dzmlaK4UL0JIfkYp9fhs98C4=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
 b=TD1QzZ4QPHDklMJQYb/qufPJ0lttV55yAV0kMyLFf1wb0Rb5/rgg8uP1Y7Cq7yDPP
 3S2R5WVqOqM2jxa5SRuJd5mnJSUMWkPQa+4aMNEPQPLRYWXGsIaNpcIQU4m9eyBOsz
 azuaotXfjgWKjDQG+nBo/33g0oX1z7z4QKvmPUl8=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4VqN7N65fPz1113;
 Wed, 29 May 2024 21:39:12 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: goodoldpaul@HIDDEN) by localhost (Postfix) with
 ESMTPSA id 4VqN7N5c2qz110x; Wed, 29 May 2024 21:39:12 +0000 (UTC)
From: Giacomo Leidi <goodoldpaul@HIDDEN>
To: 71263 <at> debbugs.gnu.org
Subject: [PATCH 3/5] gnu: docker: Allow setting Shepherd auto-start? in
 oci-container-configuration.
Date: Wed, 29 May 2024 23:38:54 +0200
Message-ID: <599079e06b2d086978ec21a1179f477c5497fc78.1717018736.git.goodoldpaul@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <31ff6a93a8c7b50e5152f75b091b28851d5c4cc8.1717018735.git.goodoldpaul@HIDDEN>
References: <31ff6a93a8c7b50e5152f75b091b28851d5c4cc8.1717018735.git.goodoldpaul@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Matthew Trzcinski <matt@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 71263
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

* gnu/services/docker.scm (oci-container-configuration)
[auto-start?]: New field;
(oci-container-shepherd-service): use it.

Change-Id: Id093d93effbbec3e1be757f8be83cf5f62eaeda7
---
 doc/guix.texi           | 4 ++++
 gnu/services/docker.scm | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/doc/guix.texi b/doc/guix.texi
index 954196b14c..dfc4d65349 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -40649,6 +40649,10 @@ Miscellaneous Services
 standard output and standard error are redirected.  @code{log-file} is created
 if it does not exist, otherwise it is appended to.
 
+@item @code{auto-start?} (default: @code{#t}) (type: boolean)
+Whether this service should be started automatically by the Shepherd.  If it
+is @code{#f} the service has to be started manually with @command{herd start}.
+
 @item @code{network} (default: @code{""}) (type: string)
 Set a Docker network for the spawned container.
 
diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
index 678e8b1139..712ca14cba 100644
--- a/gnu/services/docker.scm
+++ b/gnu/services/docker.scm
@@ -75,6 +75,7 @@ (define-module (gnu services docker)
             oci-container-configuration-provision
             oci-container-configuration-requirement
             oci-container-configuration-log-file
+            oci-container-configuration-auto-start?
             oci-container-configuration-network
             oci-container-configuration-ports
             oci-container-configuration-volumes
@@ -467,6 +468,10 @@ (define-configuration/no-serialization oci-container-configuration
    "When @code{log-file} is set, it names the file to which the service’s
 standard output and standard error are redirected.  @code{log-file} is created
 if it does not exist, otherwise it is appended to.")
+  (auto-start?
+   (boolean #t)
+   "Whether this service should be started automatically by the Shepherd.  If it
+is @code{#f} the service has to be started manually with @command{herd start}.")
   (network
    (maybe-string)
    "Set a Docker network for the spawned container.")
@@ -670,6 +675,8 @@ (define (oci-container-shepherd-service config)
                             (oci-image-repository image))))))
 
   (let* ((docker (file-append docker-cli "/bin/docker"))
+         (auto-start?
+          (oci-container-configuration-auto-start? config))
          (user (oci-container-configuration-user config))
          (group (oci-container-configuration-group config))
          (host-environment
@@ -691,6 +698,7 @@ (define (oci-container-shepherd-service config)
     (shepherd-service (provision `(,(string->symbol name)))
                       (requirement `(dockerd user-processes ,@requirement))
                       (respawn? #f)
+                      (auto-start? auto-start?)
                       (documentation
                        (string-append
                         "Docker backed Shepherd service for "
-- 
2.41.0
Information forwarded to pelzflorian@HIDDEN, ludo@HIDDEN, matt@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:
bug#71263; Package guix-patches. Full text available.

Message received at 71263 <at> debbugs.gnu.org:


Received: (at 71263) by debbugs.gnu.org; 29 May 2024 21:39:32 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 29 17:39:32 2024
Received: from localhost ([127.0.0.1]:55971 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sCR19-0008Ar-Fq
	for submit <at> debbugs.gnu.org; Wed, 29 May 2024 17:39:32 -0400
Received: from confino.investici.org ([93.190.126.19]:50981)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <goodoldpaul@HIDDEN>) id 1sCR18-0008Ab-Ex
 for 71263 <at> debbugs.gnu.org; Wed, 29 May 2024 17:39:30 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org;
 s=stigmate; t=1717018752;
 bh=DFvx5tQ9zKr7KFZIaKLobu/a8SOHHJF9h0gtSVbm4CU=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
 b=MxFVcprjEZctnbxTK/kXoJZELQSRYbiYDN8WDOxliOekevAykTz2rAB59AgdzWNpE
 wZ6Aqm5nmmMHSMyGUarOIzXn7XvSPFm1oPgQwUBrUxbf/zl8vQ5/Z9QrqYuSMhbRkk
 tC3tbd/0uvZaaEENLnaClRjlHpsfnWBt05RDQvYo=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4VqN7N4HN1z1112;
 Wed, 29 May 2024 21:39:12 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: goodoldpaul@HIDDEN) by localhost (Postfix) with
 ESMTPSA id 4VqN7N3mKtz110x; Wed, 29 May 2024 21:39:12 +0000 (UTC)
From: Giacomo Leidi <goodoldpaul@HIDDEN>
To: 71263 <at> debbugs.gnu.org
Subject: [PATCH 2/5] gnu: docker: Allow setting Shepherd log-file in
 oci-container-configuration.
Date: Wed, 29 May 2024 23:38:53 +0200
Message-ID: <9377ac0cd61279e36e99ac54a14ca8d714c593f1.1717018735.git.goodoldpaul@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <31ff6a93a8c7b50e5152f75b091b28851d5c4cc8.1717018735.git.goodoldpaul@HIDDEN>
References: <31ff6a93a8c7b50e5152f75b091b28851d5c4cc8.1717018735.git.goodoldpaul@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Matthew Trzcinski <matt@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 71263
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

* gnu/services/docker.scm (oci-container-configuration)
[log-file]: New field;
(oci-container-shepherd-service): use it.

Change-Id: Icad29ac6342b6f5bafc0d9be13a93cee99674185
---
 doc/guix.texi           |  5 +++++
 gnu/services/docker.scm | 36 ++++++++++++++++++++++++------------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 8662586b46..954196b14c 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -40644,6 +40644,11 @@ Miscellaneous Services
 Set additional Shepherd services dependencies to the provisioned
 Shepherd service.
 
+@item @code{log-file} (default: @code{""}) (type: string)
+When @code{log-file} is set, it names the file to which the service's
+standard output and standard error are redirected.  @code{log-file} is created
+if it does not exist, otherwise it is appended to.
+
 @item @code{network} (default: @code{""}) (type: string)
 Set a Docker network for the spawned container.
 
diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
index 7aff8dcc5f..678e8b1139 100644
--- a/gnu/services/docker.scm
+++ b/gnu/services/docker.scm
@@ -74,6 +74,7 @@ (define-module (gnu services docker)
             oci-container-configuration-image
             oci-container-configuration-provision
             oci-container-configuration-requirement
+            oci-container-configuration-log-file
             oci-container-configuration-network
             oci-container-configuration-ports
             oci-container-configuration-volumes
@@ -461,6 +462,11 @@ (define-configuration/no-serialization oci-container-configuration
    (list-of-symbols '())
    "Set additional Shepherd services dependencies to the provisioned Shepherd
 service.")
+  (log-file
+   (maybe-string)
+   "When @code{log-file} is set, it names the file to which the service’s
+standard output and standard error are redirected.  @code{log-file} is created
+if it does not exist, otherwise it is appended to.")
   (network
    (maybe-string)
    "Set a Docker network for the spawned container.")
@@ -669,12 +675,16 @@ (define (oci-container-shepherd-service config)
          (host-environment
           (oci-container-configuration-host-environment config))
          (command (oci-container-configuration-command config))
+         (log-file (oci-container-configuration-log-file config))
          (provision (oci-container-configuration-provision config))
          (requirement (oci-container-configuration-requirement config))
          (image (oci-container-configuration-image config))
          (image-reference (oci-image-reference image))
          (options (oci-container-configuration->options config))
          (name (guess-name provision image))
+         (loader (if (oci-image? image)
+                     (%oci-image-loader name image image-reference)
+                     #f))
          (extra-arguments
           (oci-container-configuration-extra-arguments config)))
 
@@ -687,18 +697,20 @@ (define (oci-container-shepherd-service config)
                         (if (oci-image? image) name image) "."))
                       (start
                        #~(lambda ()
-                          (when #$(oci-image? image)
-                            (invoke #$(%oci-image-loader
-                                       name image image-reference)))
-                          (fork+exec-command
-                           ;; docker run [OPTIONS] IMAGE [COMMAND] [ARG...]
-                           (list #$docker "run" "--rm" "--name" #$name
-                                 #$@options #$@extra-arguments
-                                 #$image-reference #$@command)
-                           #:user #$user
-                           #:group #$group
-                           #:environment-variables
-                           (list #$@host-environment))))
+                           (when #$(oci-image? image)
+                             (invoke #$loader))
+                           (fork+exec-command
+                            ;; docker run [OPTIONS] IMAGE [COMMAND] [ARG...]
+                            (list #$docker "run" "--rm" "--name" #$name
+                                  #$@options #$@extra-arguments
+                                  #$image-reference #$@command)
+                            #:user #$user
+                            #:group #$group
+                            #$@(if (maybe-value-set? log-file)
+                                   (list #:log-file log-file)
+                                   '())
+                            #:environment-variables
+                            (list #$@host-environment))))
                       (stop
                        #~(lambda _
                            (invoke #$docker "rm" "-f" #$name)))
-- 
2.41.0
Information forwarded to pelzflorian@HIDDEN, ludo@HIDDEN, matt@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:
bug#71263; Package guix-patches. Full text available.

Message received at 71263 <at> debbugs.gnu.org:


Received: (at 71263) by debbugs.gnu.org; 29 May 2024 21:39:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 29 17:39:26 2024
Received: from localhost ([127.0.0.1]:55961 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sCR13-0008AJ-Bd
	for submit <at> debbugs.gnu.org; Wed, 29 May 2024 17:39:26 -0400
Received: from confino.investici.org ([93.190.126.19]:48531)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <goodoldpaul@HIDDEN>) id 1sCR11-0008AA-36
 for 71263 <at> debbugs.gnu.org; Wed, 29 May 2024 17:39:23 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org;
 s=stigmate; t=1717018752;
 bh=wMZoJp5SG5VLI0v9TimsUOowPD1K1DKB8UesoC6q+fw=;
 h=From:To:Cc:Subject:Date:From;
 b=UhBsluvyevlm4biWkspy+ANL2Uj0/43v81d24ZdTf4zY0M3Asnjhv8iF2Jo9bxN1t
 1U4gG4rQq4n2X7fWspGI4QTxtGbBBM5u4rkHdArRWEyzDaqIrz3TtYRgD5CRHYxWtw
 HF4QSTWfPpDzPshCt/GXtPTIi86aHT0WH9Yi7Lwo=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4VqN7N2Qxqz1111;
 Wed, 29 May 2024 21:39:12 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: goodoldpaul@HIDDEN) by localhost (Postfix) with
 ESMTPSA id 4VqN7N1ll8z110x; Wed, 29 May 2024 21:39:12 +0000 (UTC)
From: Giacomo Leidi <goodoldpaul@HIDDEN>
To: 71263 <at> debbugs.gnu.org
Subject: [PATCH 1/5] doc: Minor changes to the OCI-backed Services
 documentation.
Date: Wed, 29 May 2024 23:38:52 +0200
Message-ID: <31ff6a93a8c7b50e5152f75b091b28851d5c4cc8.1717018735.git.goodoldpaul@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>, Ludovic Courtès <ludo@HIDDEN>, Matthew Trzcinski <matt@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 71263
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

* doc/guix.texi: Clarify the example and remove reduntant escapes.

Change-Id: I38f5517ae46b391ba21ae5a94c6dcc272e245036
---
 doc/guix.texi | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index c1ff049f03..8662586b46 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -40547,6 +40547,7 @@ Miscellaneous Services
 (service oci-container-service-type
          (list
           (oci-container-configuration
+           (network "host")
            (image
             (oci-image
              (repository "guile")
@@ -40559,20 +40560,17 @@ Miscellaneous Services
             '("-c" "(display \"hello!\n\")")))
           (oci-container-configuration
            (image "prom/prometheus")
-           (network "host")
            (ports
              '(("9000" . "9000")
                ("9090" . "9090"))))
           (oci-container-configuration
            (image "grafana/grafana:10.0.1")
            (network "host")
-           (ports
-             '(("3000" . "3000")))
            (volumes
              '("/var/lib/grafana:/var/lib/grafana")))))
 @end lisp
 
-In this example two different Shepherd services are going be added to the
+In this example three different Shepherd services are going be added to the
 system.  Each @code{oci-container-configuration} record translates to a
 @code{docker run} invocation and its fields directly map to options.  You can
 refer to the
@@ -40580,8 +40578,8 @@ Miscellaneous Services
 documentation for the semantics of each value.  If the images are not found they
 will be
 @url{https://docs.docker.com/engine/reference/commandline/pull/,pulled}.  The
-spawned services are going to be attached to the host network and are supposed
-to behave like other processes.
+services with @code{(network "host")} are going to be attached to the host network
+and are supposed to behave like native processes with regard to networking.
 
 @end defvar
 
@@ -40613,8 +40611,8 @@ Miscellaneous Services
 value can be a list of pairs or strings, even mixed:
 
 @lisp
-(list '(\"LANGUAGE\" . \"eo:ca:eu\")
-      \"JAVA_HOME=/opt/java\")
+(list '("LANGUAGE\" . "eo:ca:eu")
+      "JAVA_HOME=/opt/java")
 @end lisp
 
 Pair members can be strings, gexps or file-like objects. Strings are passed

base-commit: 6f72ad465c1e2df965e8d73b209497b4ef456527
-- 
2.41.0
Information forwarded to pelzflorian@HIDDEN, ludo@HIDDEN, matt@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:
bug#71263; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 29 May 2024 21:37:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 29 17:37:59 2024
Received: from localhost ([127.0.0.1]:55891 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sCQze-000850-RX
	for submit <at> debbugs.gnu.org; Wed, 29 May 2024 17:37:59 -0400
Received: from lists.gnu.org ([209.51.188.17]:48384)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <goodoldpaul@HIDDEN>) id 1sCQzc-00084l-Is
 for submit <at> debbugs.gnu.org; Wed, 29 May 2024 17:37:56 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <goodoldpaul@HIDDEN>)
 id 1sCQzR-0000Jv-HG
 for guix-patches@HIDDEN; Wed, 29 May 2024 17:37:46 -0400
Received: from confino.investici.org ([93.190.126.19])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <goodoldpaul@HIDDEN>)
 id 1sCQzP-0001Gx-5t
 for guix-patches@HIDDEN; Wed, 29 May 2024 17:37:45 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org;
 s=stigmate; t=1717018650;
 bh=KeNhiX9pXQ0vopOg0CXJjJtYkVNiasaxdakmt1KSrpI=;
 h=Date:To:From:Subject:From;
 b=c70mD3/JeSdU9MhQqY+b43OrqTL7C94EMAR6X9Fz3tPI0WNhNHESZtLTotIL2AWVt
 SG7bfJbmWYMeGKXGvjrH2M1/eBQQ/AEy1KthxM1DeKdc+Cxv/4mL3FZqg22qgn16cE
 /arp53L+K3qxpBYgcTjk8GbyTcscwSXRoOEEWYjc=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4VqN5Q3zh3z1111
 for <guix-patches@HIDDEN>; Wed, 29 May 2024 21:37:30 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: goodoldpaul@HIDDEN) by localhost (Postfix) with
 ESMTPSA id 4VqN5Q3Jmsz110x
 for <guix-patches@HIDDEN>; Wed, 29 May 2024 21:37:30 +0000 (UTC)
Message-ID: <39e6b8e8-c1df-f5fb-5e43-f238d0d4067f@HIDDEN>
Date: Wed, 29 May 2024 23:37:30 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.0
To: guix-patches@HIDDEN
Content-Language: en-US
From: paul <goodoldpaul@HIDDEN>
Subject: Add additional fields to oci-container-configuration
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Received-SPF: pass client-ip=93.190.126.19;
 envelope-from=goodoldpaul@HIDDEN; helo=confino.investici.org
X-Spam_score_int: -27
X-Spam_score: -2.8
X-Spam_bar: --
X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001,
 T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.4 (-)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)

Hello Guixers,

I'm sending a patch series to add some fields to the 
oci-container-configuration .

Thank you for your work

giacomo
Acknowledgement sent to paul <goodoldpaul@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#71263; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Fri, 5 Jul 2024 07:45:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.