Received: (at 71324) by debbugs.gnu.org; 4 Jun 2024 13:50:59 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 04 09:50:59 2024 Received: from localhost ([127.0.0.1]:51729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sEUZ0-00038I-0W for submit <at> debbugs.gnu.org; Tue, 04 Jun 2024 09:50:58 -0400 Received: from mail-wr1-f44.google.com ([209.85.221.44]:39657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <go.wigust@HIDDEN>) id 1sEUYx-00037t-V0 for 71324 <at> debbugs.gnu.org; Tue, 04 Jun 2024 09:50:56 -0400 Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-35dca51a5b1so261111f8f.2 for <71324 <at> debbugs.gnu.org>; Tue, 04 Jun 2024 06:50:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717508977; x=1718113777; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=/dzdluFHBtpupsgP4+H8Q/95Rvg6ujUtcrzE6OzDDdc=; b=JZHvlkd2JK8Rjic+UXbjsBnHOBRTxO0DLbKHUS3cWUm5nvkhq6Qbf2x10t7gTjgQBq PcfCCZU/34tF80+lbEpnXQBML0BwARIm7RPS5W+3WbptxaC6rGFfYIcTrPrgP1vniS/E DNnGdo4hA1EsFG8QFcbDv3YpXtzPV6xl9/GYSAqpZ5Fd+s5am8fSJbqL2cYu7xnOtpqW /eAPRLopnwZE3SZxdQBPZyTXoAdK5hH+N2BHSYNGhdTidcygUKUdni1KoN7qEGZZpzaB C9bGBQcg+Py0Y76f0RLFk5qrEQeiPrO8glvULZLJVrG8lfKaVTNa0rjzIW/ia2e218+/ CRpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717508977; x=1718113777; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/dzdluFHBtpupsgP4+H8Q/95Rvg6ujUtcrzE6OzDDdc=; b=jRqIT+q/LR2Q/fIaSHLxcLe5UWSFw+OGXukkykFVOqy1CyKXkFMMMna8dlNlhov9ow zCf0+iFR874CzVy6JC1K6iPAq0N8NABEztY/k/rPG+BPzlArjK3BHYksM5Zi2JrfZNe4 32msN92FoNyeyxhC9Hok5dqrJKQ427zgRNrCQDh6g6jzsvO3N5V0i2b7rIMp+LmxLYs1 mWBVQOrT6FozhYcbWzYQdf/fxgo6vqML1t1hMNGXaihfi3AmZZC/RlxphCUwp9vXDWA/ l73uT8j2EOQCQAkwAp0UFddu+Bf8qeLONtl4/Szbpkydsm5CxA5HbGHYwNA9eMxunJoK fdEQ== X-Forwarded-Encrypted: i=1; AJvYcCUfyCN1w5vw4ysa6ZQ7ET2OcavMVrsV1z1SylZJ6SZhJvQdh3gXFj3BphdZtU17bwgDXDJdTSn+pbcfnx4jCm9nDbpp6Fk= X-Gm-Message-State: AOJu0YxNovtsBLG3a48bTuV4GqxWeyKGI5i3CqXkwBE66v3dNIV8x3ek mc3oO3SVfKlvU+ULLTegkjBHH1VYC6ZJpOviI1/KtiPleGXEBDUQN7wIaQ== X-Google-Smtp-Source: AGHT+IFN1u+B23VFv2ijItY6Xm9rjx7YSIsFXb/A17qMehz/CoTbBTAJS32l6V4OS3xC7AyINgXqgA== X-Received: by 2002:a19:e054:0:b0:51f:40a6:234a with SMTP id 2adb3069b0e04-52b896c4bf2mr7167488e87.4.1717508471691; Tue, 04 Jun 2024 06:41:11 -0700 (PDT) Received: from localhost ([93.100.15.190]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52b97da6171sm749550e87.49.2024.06.04.06.41.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 06:41:11 -0700 (PDT) From: Oleg Pykhalov <go.wigust@HIDDEN> To: Carlo Zancanaro <carlo@HIDDEN> Subject: Re: [bug#71324] [PATCH] news: Add entry for 'docker-service-type' changes. In-Reply-To: <87zfs13qth.fsf@HIDDEN> (Carlo Zancanaro's message of "Tue, 04 Jun 2024 21:11:54 +1000") References: <cover.1717333221.git.go.wigust@HIDDEN> <0ec66ae6dac10ef005782e8a1e9245b57e10d9d4.1717334243.git.go.wigust@HIDDEN> <87wmn6cr1i.fsf@HIDDEN> <87y17mjd6j.fsf@HIDDEN> <87zfs13qth.fsf@HIDDEN> Date: Tue, 04 Jun 2024 16:41:10 +0300 Message-ID: <87zfs0g70p.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71324 Cc: Julien Lepiller <julien@HIDDEN>, "pelzflorian \(Florian Pelz\)" <pelzflorian@HIDDEN>, 71324 <at> debbugs.gnu.org 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 Hello Carlo, Thank you for your thoughtful review and valuable suggestions. Carlo Zancanaro <carlo@HIDDEN> writes: > On Mon, Jun 03 2024, Oleg Pykhalov wrote: >> Every docker-service-type user will need to add containerd-service-type >> to their system configurations, otherwise a message about not any >> service provides containerd will be displayed during reconfigure. > > Is this necessary? If I understand correctly, the docker service has a > hard dependency on containerd, so having to specify it every time is > unnecessary boilerplate. Could we add an extension for containerd that > does nothing, but which the docker service can use just to request its > inclusion? Something like: Technically, Docker relies on a container runtime, not specifically limited to containerd. While containerd is a popular choice, there are alternative runtime options available as well. > (define containerd-service-type > (service-type (name 'containerd) > (description ...) > (extensions ...) > ;; Declare an extension point, so containerd can be requested > ;; by other services without affecting its configuration. > (compose (const #t)) > (extend (lambda (config _) config)) > (default-value (containerd-configuration)))) > > (define docker-service-type > (service-type ... > (extensions > ... > (service-extension containerd-service-type (const #t))))) > > That way users could instantiate containerd themselves if they need some > particular configuration, but if not it would be pulled in automatically > by the docker service. Hopefully this would cause less of an issue for > existing configs that don't use a custom containerd (like mine). Will this mechanism support the use of different container runtimes? > We could even, for backwards compatibility, allow the docker service > type to pass through the containerd package from its old configuration > (while printing a warning). This could make it possible to separate > containerd from docker without breaking any existing configurations. If I understand correctly, could we potentially prevent users from needing to provide the containerd-service-type and instead issue a warning that they will need to provide it in the future? I believe this would be a great solution, but I couldn't locate it while writing this patch. Regards, Oleg. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJIBAEBCgAyFiEEcjhxI46s62NFSFhXFn+OpQAa+pwFAmZfGXYUHGdvLndpZ3Vz dEBnbWFpbC5jb20ACgkQFn+OpQAa+pzDjQ/+Jsx8LqEmC12vve2D/5r+AidLZiO7 A3ZP7OzOsYdYjlNVUjaPHl0oDVaywSx7ocoZHx/R5UC2B4G8nPSdrN61RLJirsOe rbrJ7Cetbmilfu8svoE8Tjh5x7RDox2of9JJ0J3lTKGN1WjK7DOUez+2BKki3UAI uSQ4LtuPZ0QPx4uFFquLsnxQ8t77XjlMyLLtVGkCpPBTzTu/Is61FCe5W6G6mnEo Ic5df6PITl8Jyc4frQ8sByqIiRcBAM6CebS+X2LzL55Hfq2a1IXQOoG0MlRA13MB FBYx2Ap+k5WQK+tRsiQp6XMI9r++/9Z9YUTpL0cDz0QrTb+vbTRw4Rnh/KEvJ3uM 70HrazWdRN+qCM2vbLBJopr1IiikahCYWaKchlSHGZRJEvMVOxMJEj4ykElQJfxT cDWxgJICvl6R0rFMXMPUVu0TY3O/nVGCM0M2haZeiE7C5plHUKCOEvrOuNeQYRay 4P3YDIAi2gkrAmN3nn1WqIXdMocRESGE3jMIdB/fTi7kZiPluhzvgyA34SJCCJHs Hr41rv0Tn5KO3ubH/r7jiLerBkN6RuJELHxLBU+XRs6FPUd0GS6c3/ya7TwNVV1f FxqEEpxRHAs90L+avSUTp9HPnR3aQLgqtmcMIYdFsu4TXRjy8TC5I56QfM2O+fJX xBQX89foOIXbG4s= =WAtb -----END PGP SIGNATURE----- --=-=-=--
guix-patches@HIDDEN:bug#71324; Package guix-patches.
Full text available.
Received: (at 71324) by debbugs.gnu.org; 4 Jun 2024 11:12:22 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 04 07:12:22 2024
Received: from localhost ([127.0.0.1]:39925 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sES5W-0001LV-4m
for submit <at> debbugs.gnu.org; Tue, 04 Jun 2024 07:12:22 -0400
Received: from voltorb.zancanaro.id.au ([45.77.50.64]:39424)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <carlo@HIDDEN>) id 1sES5T-0001Kp-6i
for 71324 <at> debbugs.gnu.org; Tue, 04 Jun 2024 07:12:20 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=k1; bh=lkHHKrn/ucsu1rj
m4PEq7NgsRMP3yyyWtb9LWiYbXcA=;
h=date:references:in-reply-to:subject:
cc:to:from; d=zancanaro.id.au; b=lCQLl7gr3aSHis+T4OFICk9bkxrek5lHA7vkK
LpJ5RdfVeLbgLKVKlOyf2qppYihOOsh1q305DJstfWYBgkb11/xuNL3qycXXDIbfuYlLNl
pZ1qifXVeyAThZpnxsOBoyuIz49/d7L1SV6tX1SOP3y/qs3+QlUgDEtiuICC8Z8k=
Received: by voltorb.zancanaro.id.au (OpenSMTPD) with ESMTPSA id 015e33d4
(TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO);
Tue, 4 Jun 2024 11:11:49 +0000 (UTC)
From: Carlo Zancanaro <carlo@HIDDEN>
To: Oleg Pykhalov <go.wigust@HIDDEN>
Subject: Re: [bug#71324] [PATCH] news: Add entry for 'docker-service-type'
changes.
In-Reply-To: <87y17mjd6j.fsf@HIDDEN> (Oleg Pykhalov's message of "Mon, 03
Jun 2024 17:47:32 +0300")
References: <cover.1717333221.git.go.wigust@HIDDEN>
<0ec66ae6dac10ef005782e8a1e9245b57e10d9d4.1717334243.git.go.wigust@HIDDEN>
<87wmn6cr1i.fsf@HIDDEN> <87y17mjd6j.fsf@HIDDEN>
Date: Tue, 04 Jun 2024 21:11:54 +1000
Message-ID: <87zfs13qth.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 71324
Cc: Julien Lepiller <julien@HIDDEN>,
"pelzflorian \(Florian Pelz\)" <pelzflorian@HIDDEN>,
71324 <at> debbugs.gnu.org
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 (-)
On Mon, Jun 03 2024, Oleg Pykhalov wrote:
> Every docker-service-type user will need to add containerd-service-type
> to their system configurations, otherwise a message about not any
> service provides containerd will be displayed during reconfigure.
Is this necessary? If I understand correctly, the docker service has a
hard dependency on containerd, so having to specify it every time is
unnecessary boilerplate. Could we add an extension for containerd that
does nothing, but which the docker service can use just to request its
inclusion? Something like:
--8<---------------cut here---------------start------------->8---
(define containerd-service-type
(service-type (name 'containerd)
(description ...)
(extensions ...)
;; Declare an extension point, so containerd can be requested
;; by other services without affecting its configuration.
(compose (const #t))
(extend (lambda (config _) config))
(default-value (containerd-configuration))))
(define docker-service-type
(service-type ...
(extensions
...
(service-extension containerd-service-type (const #t)))))
--8<---------------cut here---------------end--------------->8---
That way users could instantiate containerd themselves if they need some
particular configuration, but if not it would be pulled in automatically
by the docker service. Hopefully this would cause less of an issue for
existing configs that don't use a custom containerd (like mine).
We could even, for backwards compatibility, allow the docker service
type to pass through the containerd package from its old configuration
(while printing a warning). This could make it possible to separate
containerd from docker without breaking any existing configurations.
Carlo
guix-patches@HIDDEN:bug#71324; Package guix-patches.
Full text available.
Received: (at 71324) by debbugs.gnu.org; 4 Jun 2024 10:13:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Jun 04 06:13:47 2024
Received: from localhost ([127.0.0.1]:35847 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sERAp-00079C-1j
for submit <at> debbugs.gnu.org; Tue, 04 Jun 2024 06:13:47 -0400
Received: from relay.yourmailgateway.de ([188.68.63.98]:39259)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <pelzflorian@HIDDEN>) id 1sERAi-00078f-4p
for 71324 <at> debbugs.gnu.org; Tue, 04 Jun 2024 06:13:46 -0400
Received: from mors-relay-2501.netcup.net (localhost [127.0.0.1])
by mors-relay-2501.netcup.net (Postfix) with ESMTPS id 4VtmdK2qSZz610G;
Tue, 4 Jun 2024 12:13:25 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de;
s=key2; t=1717496005;
bh=4Fpp9egVuFxvsdswqWDfiwbWVrlIoNG3ESn8oy2/i8k=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=HWajijGTiYFLNdtpidSMNKIJyg/rQ+Ls9XGWKu+6hDBTMMWDoHrNORdfUW0bfvgss
VDNiFw8lNB0324wid96ekUiAyLql52HriwPWMspGiT4CfiYR/k0DisMGCSA3DDtx3V
VpuGb6eQ8zJEqA629oYKTchIquo1UtKPIjG9atgJNIXdI9A8tbYcDaOM6vRDtahExp
g5BO5nOtL9w2bw5ZQBCHn1jK33rZeH6nENW1MH5mX57ZG+4ZoiVGZegxSNyo8xSnNH
802XUPIanMH24BAyyIlQwmBGSNY0wQODDDw4NaBkJKUfabHr4zJ25eDc8bcofMpCYM
1mwJWDdMROUsQ==
Received: from policy01-mors.netcup.net (unknown [46.38.225.35])
by mors-relay-2501.netcup.net (Postfix) with ESMTPS id 4VtmdK25mzz4x9G;
Tue, 4 Jun 2024 12:13:25 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net
X-Spam-Flag: NO
X-Spam-Score: -2.9
X-Spam-Level:
X-Spam-Status: No, score=-2.9 required=6.31 tests=[ALL_TRUSTED=-1,
BAYES_00=-1.9] autolearn=ham autolearn_force=no
Received: from mxe217.netcup.net (unknown [10.243.12.53])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by policy01-mors.netcup.net (Postfix) with ESMTPS id 4VtmdJ4sh4z8sbY;
Tue, 4 Jun 2024 12:13:24 +0200 (CEST)
Received: from florianrock64 (ipb2186896.dynamic.kabel-deutschland.de
[178.24.104.150])
by mxe217.netcup.net (Postfix) with ESMTPSA id 1FDD183942;
Tue, 4 Jun 2024 12:13:17 +0200 (CEST)
From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN>
To: Oleg Pykhalov <go.wigust@HIDDEN>
Subject: Re: [bug#71324] [PATCH 2/2] news: Add entry for
'docker-service-type' changes.
In-Reply-To: <c72c03bc553a5a6a21e9644ee5cbab260dab88cc.1717453849.git.go.wigust@HIDDEN>
(Oleg Pykhalov's message of "Tue, 4 Jun 2024 01:30:49 +0300")
References: <87r0de3vkh.fsf@HIDDEN>
<c72c03bc553a5a6a21e9644ee5cbab260dab88cc.1717453849.git.go.wigust@HIDDEN>
Date: Tue, 04 Jun 2024 12:13:17 +0200
Message-ID: <87tti92eyq.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Rspamd-Queue-Id: 1FDD183942
X-Rspamd-Server: rspamd-worker-8404
X-NC-CID: kiDskfSnCNNMaSUqXrJP15rB7/ifH0NCS2FBs3ss+j7YBspcPtJSLBuz
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 71324
Cc: Julien Lepiller <julien@HIDDEN>, 71324 <at> debbugs.gnu.org
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 (-)
Thank you for making the changes. Could you similarly augment the
German translation in this way:
(de "Es gibt einen eigenen containerd-Dienst losgel=C3=B6st von
@code{docker-service-type}. In Zukunft m=C3=BCssen Nutzer dort manuelle
Einstellungen f=C3=BCr containerd vornehmen. Der Dienst
@code{containerd-service-type} muss zur Systemkonfiguration hinzugef=C3=BCgt
werden, sonst wird durch @code{guix system reconfigure} eine Meldung
gezeigt, dass kein Dienst @code{containerd} zur Verf=C3=BCgung stellt.
Siehe @command{info \"(guix.de) Verschiedene Dienste\"} f=C3=BCr genauere
Informationen.")))
Regards,
Florian
guix-patches@HIDDEN:bug#71324; Package guix-patches.
Full text available.
Received: (at 71324) by debbugs.gnu.org; 3 Jun 2024 22:32:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jun 03 18:32:50 2024
Received: from localhost ([127.0.0.1]:55927 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sEGEU-0005Pp-5o
for submit <at> debbugs.gnu.org; Mon, 03 Jun 2024 18:32:50 -0400
Received: from mail-lj1-f181.google.com ([209.85.208.181]:39479)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <go.wigust@HIDDEN>) id 1sEGES-0005PG-Fl
for 71324 <at> debbugs.gnu.org; Mon, 03 Jun 2024 18:32:49 -0400
Received: by mail-lj1-f181.google.com with SMTP id
38308e7fff4ca-2eab353ef78so2160581fa.2
for <71324 <at> debbugs.gnu.org>; Mon, 03 Jun 2024 15:32:35 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1717453889; x=1718058689; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=IJponn6bNibueooydjO34roFxIabT4pjqZBjaO8zzKM=;
b=edz3d2bSAosPqL3EQpjMvfHPIkKZneCKfcSLn+CG9Dm9MtvLghOPkRbgKysiKYxBno
T3TorxRfj9VYrTjBxk3pGKG+nreL3kOAcfUEubH50FVRZ3fixL9s+PRNduB5YE4LbPA3
JbQY9KMHfCAe5OfIDcX8JmUgk+omfnHq0v9Jt6lXC2Gzenmayy73u+YTSkVuX5Wnb6aj
c8j+Yq8rPsy+/YxHhZVadjQfT69cRqAo2fSOnnI6JyUuWI+j3+UfQCUAGIYNF598haSV
vd6Sh4kU2oiSQBnnHekpWz1ogH061Trj0zruwF0eBVJotyhkLLGDvbSFj1kCorxnlHSH
WyWw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1717453889; x=1718058689;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=IJponn6bNibueooydjO34roFxIabT4pjqZBjaO8zzKM=;
b=PXEgE1IMXJ/i1MLGHIlV/ge5tOgJZaDzPUF7m+LGG/XsMRIEtS2PV72uPoCmVl/7/c
JPXybxiYwM07OLElWiDiLZzP4bW5cyvLVXSe7SbSOmRm8+2+bFR8CdfEy7XLE/kcjqkl
4vvUzknz2PR8gtWCIu0Jr9+rFcUb6W/PL8LghltQ3jCN3BPWn0rpUnBeQCS0xPHCI3bP
6QtJUVvpHEFu1Kj+20wXVh42RGjRClriN6K3f0elQ2Fs2L6YQXK3OkvvzlqRh6M24eWH
Lcxk1ahpbaBNqxS4PUzsoROhS7xGk48E8Z+8dSnwFqXmfLucSSBFKfm/iNhgE5XZsJ8s
gACA==
X-Gm-Message-State: AOJu0YyKvrnlJ1Xn8dtu5JF/Nhn6qfBH4LIGtbRl2tcFHF7LiuG+Msqy
yoQfRaKJsBC1SQSyrMVX13ag7jnEO/RsIIteIJbzNYNOscyUxn458uLkgA==
X-Google-Smtp-Source: AGHT+IGkeGObX+Qa6zrIGaD6SOHEsIjRUu6KixlhaLIFPHyGmAFhvnhE9ttjRTHOUbnDj5AcVYV+fw==
X-Received: by 2002:ac2:5962:0:b0:52b:8325:6eed with SMTP id
2adb3069b0e04-52b89568fe2mr5772436e87.2.1717453888828;
Mon, 03 Jun 2024 15:31:28 -0700 (PDT)
Received: from guixsd.wugi.info ([93.100.15.190])
by smtp.gmail.com with ESMTPSA id
2adb3069b0e04-52b84d3f9ecsm1342328e87.98.2024.06.03.15.31.28
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 03 Jun 2024 15:31:28 -0700 (PDT)
From: Oleg Pykhalov <go.wigust@HIDDEN>
To: 71324 <at> debbugs.gnu.org
Subject: [PATCH 2/2] news: Add entry for 'docker-service-type' changes.
Date: Tue, 4 Jun 2024 01:30:49 +0300
Message-ID: <c72c03bc553a5a6a21e9644ee5cbab260dab88cc.1717453849.git.go.wigust@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <87r0de3vkh.fsf@HIDDEN>
References: <87r0de3vkh.fsf@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>,
Julien Lepiller <julien@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 71324
Cc: Oleg Pykhalov <go.wigust@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 (-)
* etc/news.scm: Add entry.
Change-Id: I98d562d8b435b697b7c6529c5e788b5e2db9fa2a
---
etc/news.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/etc/news.scm b/etc/news.scm
index a511b7ffbc..29bf8a1909 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -31,6 +31,35 @@
(channel-news
(version 0)
+ (entry (commit "22d45fa8e5f64e42b509141c3579a0c1626a5fcf")
+ (title
+ (en "The containerd service is separated from @code{docker-service-type}")
+ (ru "Сервис containerd отделен от @code{docker-service-type}"))
+ (body
+ (en "containerd service has been decoupled from the
+@code{docker-service-type}. Moving forward, users are required to specify
+containerd settings manually for their configurations. The
+@code{containerd-service-type} service need to be added to a system
+configuration, otherwise a message about not any service provides
+@code{containerd} will be displayed during @code{guix system reconfigure}.
+
+Run @command{info \"(guix) Miscellaneous Services\"} for more info.")
+ (ru "Сервис containerd был отделен от @code{docker-service-type}.
+Впредь пользователям потребуется указывать параметры containerd вручную для
+своих конфигураций. Сервис @code{containerd-service-type} должен быть
+добавлен в конфигурацию системы, в противном случае будет отображено сообщение
+о том, что ни один сервис не предоставляет поддержку для @code{containerd} во
+время выполнения команды @code{guix system reconfigure}.
+
+Смотрите @command{info \"(guix.ru) Разнообразные службы\"} для получения более
+детальных сведений.")
+ (de "Es gibt einen eigenen containerd-Dienst losgelöst von
+@code{docker-service-type}. In Zukunft müssen Nutzer dort manuelle
+Einstellungen für containerd vornehmen.
+
+Siehe @command{info \"(guix.de) Verschiedene Dienste\"} für genauere
+Informationen.")))
+
(entry (commit "8d1d98a3aa3448b9d983e4bd64243a938b96e8ab")
(title
(en "@command{guix git authenticate} usage simplified")
--
2.41.0
pelzflorian@HIDDEN, julien@HIDDEN, guix-patches@HIDDEN:bug#71324; Package guix-patches.
Full text available.
Received: (at 71324) by debbugs.gnu.org; 3 Jun 2024 22:32:48 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jun 03 18:32:48 2024
Received: from localhost ([127.0.0.1]:55924 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sEGER-0005PV-9z
for submit <at> debbugs.gnu.org; Mon, 03 Jun 2024 18:32:48 -0400
Received: from mail-lf1-f49.google.com ([209.85.167.49]:38223)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <go.wigust@HIDDEN>) id 1sEGEM-0005P6-Tf
for 71324 <at> debbugs.gnu.org; Mon, 03 Jun 2024 18:32:46 -0400
Received: by mail-lf1-f49.google.com with SMTP id
2adb3069b0e04-52b96eafeeaso152800e87.1
for <71324 <at> debbugs.gnu.org>; Mon, 03 Jun 2024 15:32:29 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1717453883; x=1718058683; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=CJAgkoGkS8uRtXdA/ypswBErrI6JFoe9Wx54wlZIUbw=;
b=kDreOWtY+XmASb+DSGJUr56mRUylyMHi68Mmt2AVkgtKoB14qR1Q4MAlFzLCRUQHLq
WbTImbN2QNYn0/iqHzYQTYXB6+Yq9NbWc/gCwJFVuCFQvNKhNjHipCwiGMsfC/kWPdtC
UZCZ5ZbcU8FaV/bf8YbHIkJznip8ZSQUfHD+Hpt7JDwkWY/2zUBbw2itKi4Id+8Op6Wk
q1W440KhpV4b+WgnRVK1/ona94iR17MRIZLPyDbzP4j8KRoZtdC55dXx6Xm7j51N9PMu
2iug4V86d5kaRwTatf56ywLq0TGuohXAQX0DreGSF+KOJjz/QZ/5JWu80dgRaneHil5g
fSEw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1717453883; x=1718058683;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=CJAgkoGkS8uRtXdA/ypswBErrI6JFoe9Wx54wlZIUbw=;
b=tnaNL/4MAYBSTq/uUFxrvdnWyIjcM3ADfhrQ5tkXRHdOowvj13wXsn3i/Enia60Awq
shJSum3ZpbTHw0i6AltazDpQB0LGksoEBhosbg+l8AjhbUvWMBYZ2Zg5CVwyXRzzgE+s
8MGSrbirJvvpVzVBxBSK2fILFekpCZGF8wZcOv5iXorbktGQJ/ENgOmbiPZ5jFRDEZsP
onm9zmapWWb5kIBw3O+T8HysHOTbad7yZppAO8ai4cOotTcz0RfAZwoVWQbFGHivxi1l
Gkxvxmtc/WXRuT1nvpUy6GarD+HYa9uKincdrLv9NBiLWKOqkfw/XcucRbHNjhaDCFIl
C1qg==
X-Gm-Message-State: AOJu0YyZTQGmttJaUiC6PN/S+B6BAl/N97NKWTtrgiefwUdfjTXtF2Df
teduBhOqkWuKztFODvUVEeIfVwKdodOj5JFY4EqUxQZsWGliu+8S0jk3uQ==
X-Google-Smtp-Source: AGHT+IGACJmpEiqynQWg9ixzHJaL2JHtPFCEJnV+jRWmnXA+I3h2qAL1r6iHIBA32TS/SOSjFRmTkw==
X-Received: by 2002:a05:6512:1389:b0:528:3de4:12c6 with SMTP id
2adb3069b0e04-52ba43d4cd3mr389912e87.4.1717453883101;
Mon, 03 Jun 2024 15:31:23 -0700 (PDT)
Received: from guixsd.wugi.info ([93.100.15.190])
by smtp.gmail.com with ESMTPSA id
2adb3069b0e04-52b84d3f9ecsm1342328e87.98.2024.06.03.15.31.22
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 03 Jun 2024 15:31:22 -0700 (PDT)
From: Oleg Pykhalov <go.wigust@HIDDEN>
To: 71324 <at> debbugs.gnu.org
Subject: [PATCH 1/2] services: containerd: Provision separately from docker
service.
Date: Tue, 4 Jun 2024 01:30:48 +0300
Message-ID: <22d45fa8e5f64e42b509141c3579a0c1626a5fcf.1717453849.git.go.wigust@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <87r0de3vkh.fsf@HIDDEN>
References: <87r0de3vkh.fsf@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.0 (/)
X-Debbugs-Envelope-To: 71324
Cc: Oleg Pykhalov <go.wigust@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 (-)
containerd can operate independently without relying on Docker for its
configuration.
* gnu/services/docker.scm (docker-configuration): Deprecate containerd field.
(containerd-configuration, containerd-service-type): New variables.
(docker-shepherd-service): Use containerd-configuration. Delete duplicated
variable binding. Allow to configure environment variables.
(docker-service-type): Delete extension with containerd-service-type.
* gnu/tests/docker.scm (%docker-os, %oci-os): Add containerd service.
(run-docker-test, run-docker-system-test, run-oci-container-test): Run
containerd service.
* doc/guix.texi (Miscellaneous Services): Document containerd-service-type.
Change-Id: Ife0924e50a3e0aa2302d6592dae51ed894600004
---
doc/guix.texi | 44 +++++++++++++++++++++++++-
gnu/services/docker.scm | 68 ++++++++++++++++++++++++++++-------------
gnu/tests/docker.scm | 46 +++++++++++++++++++++++++++-
3 files changed, 135 insertions(+), 23 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 1224104038..d2ba6784de 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -40484,12 +40484,54 @@ Miscellaneous Services
The @code{(gnu services docker)} module provides the following services.
+@cindex containerd, container runtime
+@defvar containerd-service-type
+
+This service type operates containerd
+@url{https://containerd.io,containerd}, a daemon responsible for
+overseeing the entire container lifecycle on its host system. This
+includes image handling, storage management, container execution,
+supervision, low-level storage operations, network connections, and
+more.
+
+@end defvar
+
+@deftp {Data Type} containerd-configuration
+This is the data type representing the configuration of containerd.
+
+@table @asis
+
+@item @code{containerd} (default: @code{containerd})
+The containerd daemon package to use.
+
+@item @code{debug?} (default @code{#f})
+Enable or disable debug output.
+
+@item @code{environment-variables} (default: @code{'()})
+List of environment variables to set for @command{containerd}.
+
+This must be a list of strings where each string has the form
+@samp{@var{key}=@var{value}} as in this example:
+
+@lisp
+(list "HTTP_PROXY=socks5://127.0.0.1:9150"
+ "HTTPS_PROXY=socks5://127.0.0.1:9150")
+@end lisp
+
+@end table
+@end deftp
+
@defvar docker-service-type
This is the type of the service that runs @url{https://www.docker.com,Docker},
a daemon that can execute application bundles (sometimes referred to as
``containers'') in isolated environments.
+The @code{containerd-service-type} service need to be added to a system
+configuration, otherwise a message about not any service provides
+@code{containerd} will be displayed during @code{guix system
+reconfigure}.
+
@end defvar
@deftp {Data Type} docker-configuration
@@ -40504,7 +40546,7 @@ Miscellaneous Services
The Docker client package to use.
@item @code{containerd} (default: @var{containerd})
-The Containerd package to use.
+This field is deprecated in favor of @code{containerd-service-type} service.
@item @code{proxy} (default @var{docker-libnetwork-cmd-proxy})
The Docker user-land networking proxy package to use.
diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
index 7aff8dcc5f..a5375d1ccc 100644
--- a/gnu/services/docker.scm
+++ b/gnu/services/docker.scm
@@ -49,7 +49,9 @@ (define-module (gnu services docker)
#:use-module (ice-9 format)
#:use-module (ice-9 match)
- #:export (docker-configuration
+ #:export (containerd-configuration
+ containerd-service-type
+ docker-configuration
docker-service-type
singularity-service-type
oci-image
@@ -95,7 +97,7 @@ (define-configuration docker-configuration
"Docker client package.")
(containerd
(file-like containerd)
- "containerd package.")
+ "Deprecated. Do not use.")
(proxy
(file-like docker-libnetwork-cmd-proxy)
"The proxy package to support inter-container and outside-container
@@ -117,6 +119,18 @@ (define-configuration docker-configuration
"JSON configuration file to pass to dockerd")
(no-serialization))
+(define-configuration containerd-configuration
+ (containerd
+ (file-like containerd)
+ "containerd package.")
+ (debug?
+ (boolean #f)
+ "Enable or disable debug output.")
+ (environment-variables
+ (list '())
+ "Environment variables to set for containerd.")
+ (no-serialization))
+
(define %docker-accounts
(list (user-group (name "docker") (system? #t))))
@@ -134,24 +148,37 @@ (define (%docker-activation config)
(mkdir-p #$state-dir))))
(define (containerd-shepherd-service config)
- (let* ((package (docker-configuration-containerd config))
- (debug? (docker-configuration-debug? config))
- (containerd (docker-configuration-containerd config)))
+ (match-record config <containerd-configuration>
+ (containerd debug? environment-variables)
(shepherd-service
- (documentation "containerd daemon.")
- (provision '(containerd))
- (start #~(make-forkexec-constructor
- (list (string-append #$package "/bin/containerd")
- #$@(if debug?
- '("--log-level=debug")
- '()))
- ;; For finding containerd-shim binary.
- #:environment-variables
- (list (string-append "PATH=" #$containerd "/bin"))
- #:pid-file "/run/containerd/containerd.pid"
- #:pid-file-timeout 300
- #:log-file "/var/log/containerd.log"))
- (stop #~(make-kill-destructor)))))
+ (documentation "containerd daemon.")
+ (provision '(containerd))
+ (start #~(make-forkexec-constructor
+ (list (string-append #$containerd "/bin/containerd")
+ #$@(if debug?
+ '("--log-level=debug")
+ '()))
+ ;; For finding containerd-shim binary.
+ #:environment-variables
+ (list #$@environment-variables
+ (string-append "PATH=" #$containerd "/bin"))
+ #:pid-file "/run/containerd/containerd.pid"
+ #:pid-file-timeout 300
+ #:log-file "/var/log/containerd.log"))
+ (stop #~(make-kill-destructor)))))
+
+(define containerd-service-type
+ (service-type (name 'containerd)
+ (description "Run containerd container runtime.")
+ (extensions
+ (list
+ ;; Make sure the 'ctr' command is available.
+ (service-extension profile-service-type
+ (compose list containerd-configuration-containerd))
+ (service-extension shepherd-root-service-type
+ (lambda (config)
+ (list (containerd-shepherd-service config))))))
+ (default-value (containerd-configuration))))
(define (docker-shepherd-service config)
(let* ((docker (docker-configuration-docker config))
@@ -208,8 +235,7 @@ (define docker-service-type
%docker-activation)
(service-extension shepherd-root-service-type
(lambda (config)
- (list (containerd-shepherd-service config)
- (docker-shepherd-service config))))
+ (list (docker-shepherd-service config))))
(service-extension account-service-type
(const %docker-accounts))))
(default-value (docker-configuration))))
diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm
index d550136b4a..46c886580c 100644
--- a/gnu/tests/docker.scm
+++ b/gnu/tests/docker.scm
@@ -54,6 +54,7 @@ (define %docker-os
(service dbus-root-service-type)
(service polkit-service-type)
(service elogind-service-type)
+ (service containerd-service-type)
(service docker-service-type)))
(define (run-docker-test docker-tarball)
@@ -88,7 +89,21 @@ (define (run-docker-test docker-tarball)
(test-runner-current (system-test-runner #$output))
(test-begin "docker")
- (test-assert "service running"
+ (test-assert "containerd service running"
+ (marionette-eval
+ '(begin
+ (use-modules (gnu services herd))
+ (match (start-service 'containerd)
+ (#f #f)
+ (('service response-parts ...)
+ (match (assq-ref response-parts 'running)
+ ((pid) (number? pid))))))
+ marionette))
+
+ (test-assert "containerd PID file present"
+ (wait-for-file "/run/containerd/containerd.pid" marionette))
+
+ (test-assert "dockerd service running"
(marionette-eval
'(begin
(use-modules (gnu services herd))
@@ -234,6 +249,20 @@ (define (run-docker-system-test tarball)
(test-runner-current (system-test-runner #$output))
(test-begin "docker")
+ (test-assert "containerd service running"
+ (marionette-eval
+ '(begin
+ (use-modules (gnu services herd))
+ (match (start-service 'containerd)
+ (#f #f)
+ (('service response-parts ...)
+ (match (assq-ref response-parts 'running)
+ ((pid) (number? pid))))))
+ marionette))
+
+ (test-assert "containerd PID file present"
+ (wait-for-file "/run/containerd/containerd.pid" marionette))
+
(test-assert "service running"
(marionette-eval
'(begin
@@ -327,6 +356,7 @@ (define %oci-os
(service dbus-root-service-type)
(service polkit-service-type)
(service elogind-service-type)
+ (service containerd-service-type)
(service docker-service-type)
(extra-special-file "/shared.txt"
(plain-file "shared.txt" "hello"))
@@ -384,6 +414,20 @@ (define (run-oci-container-test)
(test-runner-current (system-test-runner #$output))
(test-begin "oci-container")
+ (test-assert "containerd service running"
+ (marionette-eval
+ '(begin
+ (use-modules (gnu services herd))
+ (match (start-service 'containerd)
+ (#f #f)
+ (('service response-parts ...)
+ (match (assq-ref response-parts 'running)
+ ((pid) (number? pid))))))
+ marionette))
+
+ (test-assert "containerd PID file present"
+ (wait-for-file "/run/containerd/containerd.pid" marionette))
+
(test-assert "dockerd running"
(marionette-eval
'(begin
base-commit: bc06affabcf68bbe93e9afee13bef8cc8c6336a2
--
2.41.0
pelzflorian@HIDDEN, ludo@HIDDEN, matt@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#71324; Package guix-patches.
Full text available.Received: (at 71324) by debbugs.gnu.org; 3 Jun 2024 15:40:13 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jun 03 11:40:13 2024 Received: from localhost ([127.0.0.1]:44127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sE9nB-0008Lz-6q for submit <at> debbugs.gnu.org; Mon, 03 Jun 2024 11:40:13 -0400 Received: from relay.yourmailgateway.de ([188.68.63.162]:48897) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pelzflorian@HIDDEN>) id 1sE9kQ-0008Df-6X for 71324 <at> debbugs.gnu.org; Mon, 03 Jun 2024 11:37:24 -0400 Received: from mors-relay-8201.netcup.net (localhost [127.0.0.1]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4VtHQG1m6Fz3rjh; Mon, 3 Jun 2024 17:17:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1717427830; bh=0uazSxUYNXFi6rQPMvsucwJEQMlgxWkS6ZwZzvF+cQ8=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=lTd3TjProrsAFoo8jP0sl8tzRzTe/Saeriv+y9z1Qqge6Q8Nr51yeQtRIDxxtOwqP Ly17hHTPHWNH2L09NXPLthAP694RNQ8NJzNnzpKTs+4L8/YFiXDBo3WcHLaB1sl7vG pI1EslJzSXzgBjLLn0CNbeqrGBxn30fb8eCGu2Cgzzzrx/3yNXpkVHuFhpmMVjqD0R Qy6GsmTczQm0K8/Rz/A3Va5NF+NhjiuU+2L0fYijU8RTFkD4HgfNkF1Eji5FEtPkNj GFxtPBn+UR69MQ8PKFF9oN6aKowIAwiposc1RSfRLcysvrCGTebXhV3AnKxclp0Dmx v6TFTofm8HoTA== Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4VtHQG13jJz3rhv; Mon, 3 Jun 2024 17:17:10 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net X-Spam-Flag: NO X-Spam-Score: -2.9 X-Spam-Level: X-Spam-Status: No, score=-2.9 required=6.31 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9] autolearn=ham autolearn_force=no Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy01-mors.netcup.net (Postfix) with ESMTPS id 4VtHQF48zVz8tY1; Mon, 3 Jun 2024 17:17:09 +0200 (CEST) Received: from florianrock64 (ipb2186896.dynamic.kabel-deutschland.de [178.24.104.150]) by mxe217.netcup.net (Postfix) with ESMTPSA id DDC458237C; Mon, 3 Jun 2024 17:17:02 +0200 (CEST) From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> To: Oleg Pykhalov <go.wigust@HIDDEN> Subject: Re: [bug#71324] [PATCH] news: Add entry for 'docker-service-type' changes. In-Reply-To: <87y17mjd6j.fsf@HIDDEN> (Oleg Pykhalov's message of "Mon, 03 Jun 2024 17:47:32 +0300") References: <cover.1717333221.git.go.wigust@HIDDEN> <0ec66ae6dac10ef005782e8a1e9245b57e10d9d4.1717334243.git.go.wigust@HIDDEN> <87wmn6cr1i.fsf@HIDDEN> <87y17mjd6j.fsf@HIDDEN> Date: Mon, 03 Jun 2024 17:17:02 +0200 Message-ID: <87r0de3vkh.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: DDC458237C X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: C1frDsP3UHo5+n2eFDhmowmX2X/43eH/Qxtt1J0n6BCq5WIsmaE6Pwfr X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71324 Cc: Julien Lepiller <julien@HIDDEN>, 71324 <at> debbugs.gnu.org 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 (-) Hello Oleg, Oleg Pykhalov <go.wigust@HIDDEN> writes: > Every docker-service-type user will need to add containerd-service-type > to their system configurations, otherwise a message about not any > service provides containerd will be displayed during reconfigure. I understand, but only now, that *every* user must make changes. Could you add this sentence to the news *and* to doc/guix.texi? Regards, Florian
guix-patches@HIDDEN:bug#71324; Package guix-patches.
Full text available.
Received: (at 71324) by debbugs.gnu.org; 3 Jun 2024 14:48:55 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jun 03 10:48:55 2024
Received: from localhost ([127.0.0.1]:42177 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sE8zW-0006IL-UM
for submit <at> debbugs.gnu.org; Mon, 03 Jun 2024 10:48:55 -0400
Received: from mail-lf1-f41.google.com ([209.85.167.41]:40244)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <go.wigust@HIDDEN>) id 1sE8zU-0006I4-U5
for 71324 <at> debbugs.gnu.org; Mon, 03 Jun 2024 10:48:54 -0400
Received: by mail-lf1-f41.google.com with SMTP id
2adb3069b0e04-52b8db018f3so271369e87.1
for <71324 <at> debbugs.gnu.org>; Mon, 03 Jun 2024 07:48:39 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1717426054; x=1718030854; darn=debbugs.gnu.org;
h=mime-version:user-agent:message-id:date:references:in-reply-to
:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=HdDkNQ1cu1XVYzzpGewrVeY1J8A4uNI0yoZ32ZMSmCM=;
b=hUXHtjjnLB7F8rcZXeZqtjO/8fdlAUTJ3App0nVAHm3OyqP/zLUTwImlHxmoKWsbnt
W3h92sQwW0XXVRshv5hWSwaJNZvOZdDsnv99sTEVRqKF0qqJXyXoEYL7FNBfU7oE+s7x
U81U9/gG8JRPzurNVoHwWGewb7bsV26JgvG+N7HEzVE6UxCANebFjOeLbuItqrO0rMBB
ltlctiCS7UvfA9g11X1zM9hqjUMEx/OOqQLKFwKNDb+SdHwvEVrwcIajom0L8Y4uIsNi
QTRAPPBYZ9Wy1JXOp0oIyb5kyl1ni40EIyCkVu8HQ7lJCtK7lfkFmMLxwCkMOi6X2Z2/
s2Pg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1717426054; x=1718030854;
h=mime-version:user-agent:message-id:date:references:in-reply-to
:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
:message-id:reply-to;
bh=HdDkNQ1cu1XVYzzpGewrVeY1J8A4uNI0yoZ32ZMSmCM=;
b=ckPqrUSBsG5Rh+zhCmFKRp2zuNPtbiriMT3oMVIFh07utSF/N/dANbjXSqW4L3uHuU
PEhK6KT+7YOFFBb7R2+IKi7n9vXK3lU+7awUYazul2zc++dXVbHCLQxhiVwfVN+Oulgp
AqqEE8rlaqL5WejELUru9h+Mt473CExyuRm6ugIx6k933+k1omcKVc5/iaW4KHFM7uu+
VIIR+SoF86jZ5PgqKbYVLjXGf0wnOv7t9DOQJ7Ovm2rhFlJ7RzcmGR4lIEJ66T4lhEcz
sMh5xDRQ/qdtZ1DmOditMA6r5t6H0ZB0O16SwU8XypTTqEoYyKwTKd/Z/8e7NkXDnEdv
lS5g==
X-Gm-Message-State: AOJu0Yx1aH8oej7CJdfORc35Y0Gl1nurRZV+/EMUg3mrO8pu5hsBO2j3
s9t22q+6SSozE4FvrqoravKkWKlzJSZo70kR0K2I0aTtm3nZYntKS2+n5g==
X-Google-Smtp-Source: AGHT+IGrTT4p1Ma3dUeVwRiBKW+ek746NI8woHP8d9efPKFMrti/rJviuE3XIJjfdp3vaTUIdYT1bg==
X-Received: by 2002:a05:6512:3282:b0:52b:74c4:272f with SMTP id
2adb3069b0e04-52b894a067emr5795872e87.0.1717426053383;
Mon, 03 Jun 2024 07:47:33 -0700 (PDT)
Received: from localhost ([93.100.15.190]) by smtp.gmail.com with ESMTPSA id
2adb3069b0e04-52b84d761f1sm1245646e87.160.2024.06.03.07.47.32
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 03 Jun 2024 07:47:32 -0700 (PDT)
From: Oleg Pykhalov <go.wigust@HIDDEN>
To: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN>
Subject: Re: [bug#71324] [PATCH] news: Add entry for 'docker-service-type'
changes.
In-Reply-To: <87wmn6cr1i.fsf@HIDDEN> (pelzflorian@HIDDEN's
message of "Mon, 03 Jun 2024 11:30:01 +0200")
References: <cover.1717333221.git.go.wigust@HIDDEN>
<0ec66ae6dac10ef005782e8a1e9245b57e10d9d4.1717334243.git.go.wigust@HIDDEN>
<87wmn6cr1i.fsf@HIDDEN>
Date: Mon, 03 Jun 2024 17:47:32 +0300
Message-ID: <87y17mjd6j.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 71324
Cc: Julien Lepiller <julien@HIDDEN>, 71324 <at> debbugs.gnu.org
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
Hello Florian,
Thank you for the review.
"pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> writes:
> The main patch=E2=80=99s commit message should contain that you changed
> doc/guix.texi.
Ouch, missed it, thank you.
> It is not clear to me, in the English news, when you write =E2=80=9CMoving
> forward, users are required to specify containerd settings manually for
> their configurations=E2=80=9D, do you really mean that only users *with m=
anual
> configurations* are required to specify containerd settings
> *separately*?
Every docker-service-type user will need to add containerd-service-type
to their system configurations, otherwise a message about not any
service provides containerd will be displayed during reconfigure.
> Could you add this German translation:
>
> Oleg Pykhalov <go.wigust@HIDDEN> writes:
>> + (entry (commit "ba9339f59fec1cd49c8d4e9f26834883f5c1aaed")
>> + (title
>> + (en "The containerd service is separated from
>> @code{docker-service-type}")
>
> (de "containerd wurde ein eigener Dienst losgel=C3=B6st von
> @code{docker-service-type}")
>
>> + (ru "=D0=A1=D0=B5=D1=80=D0=B2=D0=B8=D1=81 containerd =D0=BE=D1=
=82=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD =D0=BE=D1=82 @code{docker-service-type}"))
>> + (body
>> + (en "containerd service has been decoupled from the
>> +@code{docker-service-type}. Moving forward, users are required to spec=
ify
>> +containerd settings manually for their configurations.
>> +
>> +Run @command{info \"(guix) Miscellaneous Services\"} for more info.")
>
> (de "Es gibt einen eigenen containerd-Dienst losgel=C3=B6st von
> @code{docker-service-type}. In Zukunft m=C3=BCssen Nutzer dort manuelle
> Einstellungen f=C3=BCr containerd vornehmen.
>
> Siehe @command{info \"(guix.de) Verschiedene Dienste\"} f=C3=BCr genauere
> Informationen.")
Sure.
>> + (ru "=D0=A1=D0=B5=D1=80=D0=B2=D0=B8=D1=81 containerd =D0=B1=D1=
=8B=D0=BB =D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD =D0=BE=D1=82 @code{doc=
ker-service-type}.
>> +=D0=92=D0=BF=D1=80=D0=B5=D0=B4=D1=8C =D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=
=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=D0=BC =D0=BF=D0=BE=D1=82=D1=80=D0=
=B5=D0=B1=D1=83=D0=B5=D1=82=D1=81=D1=8F =D1=83=D0=BA=D0=B0=D0=B7=D1=8B=D0=
=B2=D0=B0=D1=82=D1=8C =D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D1=
=8B containerd =D0=B2=D1=80=D1=83=D1=87=D0=BD=D1=83=D1=8E =D0=B4=D0=BB=D1=8F
>> +=D1=81=D0=B2=D0=BE=D0=B8=D1=85 =D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=
=83=D1=80=D0=B0=D1=86=D0=B8=D0=B9.
>> +
>> +=D0=A1=D0=BC=D0=BE=D1=82=D1=80=D0=B8=D1=82=D0=B5 @command{info \"(guix)=
Miscellaneous Services\"} =D0=B4=D0=BB=D1=8F =D0=BF=D0=BE=D0=BB=D1=83=D1=
=87=D0=B5=D0=BD=D0=B8=D1=8F =D0=B1=D0=BE=D0=BB=D0=B5=D0=B5
>> +=D0=B4=D0=B5=D1=82=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D1=85 =D1=81=D0=B2=D0=
=B5=D0=B4=D0=B5=D0=BD=D0=B8=D0=B9.")))
>
> I presume you should direct Russian readers to
> @command{info \"(guix.ru) =D0=A0=D0=B0=D0=B7=D0=BD=D0=BE=D0=BE=D0=B1=D1=
=80=D0=B0=D0=B7=D0=BD=D1=8B=D0=B5 =D1=81=D0=BB=D1=83=D0=B6=D0=B1=D1=8B\"}
Yes, it will be definitely better, thank you.
Regards,
Oleg.
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQJIBAEBCgAyFiEEcjhxI46s62NFSFhXFn+OpQAa+pwFAmZd14QUHGdvLndpZ3Vz
dEBnbWFpbC5jb20ACgkQFn+OpQAa+pxDeQ//cNeopKCGusNXmxGFyK7zrKW4gbl0
xZqU2yiw4NXenG4I90cdUpoiaUKJkGnRbu+MmNBkZQOAA7AFnHjpIm6J73phIXRJ
Y2AFaZWJ+aze5lJKGbgBqwAjzP7V8wkIhdJrVOam5F9P2MLkRSYVz+X9CXxkiEeK
+8ICSKSqjgOjW4KtOrdNv19Z1Ti/OcNT/xThesLm5kyAT6zINoe5YLu60lDNeD/4
hMoNtnFBCkzQ+ZPs1wf7CkNiWWZLMm7vYmfDegY1OaH3D1Xtudf0ABLvJQ9OsW4f
2RyKlWXbihSk6fS2AqkkTkU5ugVfvPwyV3nzdxup4dw2KOD16d7RXO5vlnLo1Uc9
UDd+UzpeCGL96/M3n9wwTIKsfFiroGpZABFUa+Q/S0XvHSUXhQjHVu1AQvi0aFJY
n84Hpp6vYXzXqrJsB8NEBv20O+Y6fZrwwR+fCDdBno7SPGu2WmrLbijULjuQJT84
DzT1QpXLAGIkY/WEDLdoWsbMJOUmo7+3UNrlqsJPf9WOBln/hvSIgcfGJHhDa/4o
Ez4arg+ipSxzokHyBzoVoYbq11xZI3Xn1d8iNZZfJDrwLuj6TUJQvvBJ4PZcGtCK
ECfonYOh0yzMaeAJBx6CQifo/IPb+8/oFLMaRuVswMvExcKxPXSDZNyAJ8Ut4Gmr
BGTK0hTVu2WT36A=
=uZ9o
-----END PGP SIGNATURE-----
--=-=-=--
guix-patches@HIDDEN:bug#71324; Package guix-patches.
Full text available.Received: (at 71324) by debbugs.gnu.org; 3 Jun 2024 09:30:29 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jun 03 05:30:29 2024 Received: from localhost ([127.0.0.1]:59012 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sE41M-000688-Ns for submit <at> debbugs.gnu.org; Mon, 03 Jun 2024 05:30:29 -0400 Received: from relay.yourmailgateway.de ([188.68.63.162]:48905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pelzflorian@HIDDEN>) id 1sE41H-00067v-P6 for 71324 <at> debbugs.gnu.org; Mon, 03 Jun 2024 05:30:27 -0400 Received: from mors-relay-8201.netcup.net (localhost [127.0.0.1]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4Vt7js3Lyzz3trH; Mon, 3 Jun 2024 11:30:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1717407009; bh=yyJpWKqmH6RRmdPa9DAfGbe/qBrAeJwEorhFPPUiTpw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=luV5aucbNxwd7+duWKqhFiL5INOqFsXgTYpfg74IDoXOUSoCgh+TOU55OuI/L3/cG dcyUlNtXzuWRbL+RI17c63kQlelZxqP+EuBx2xaY6lQLQev3Sftsa8WVlbboej1GZQ 0ykh9XF9r5TqeFtT+efa08kYYIxjDBERBWVioFmtMq0JC3TUPFIE5Y1f6WgHgXbo+O NokZJ3g0Elrjap7fjniooZXQCR07shEzwNfSy7yp4Eww6lrh1CqvoBjgyQp+Mbivs/ agVXRgyIfjVzJEF3i3J87s1zi/1lgfYz5jjVqTN/V1HGTkajXVQieeQJD1riQnn2+v EHxvSBUuB/mbw== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8201.netcup.net (Postfix) with ESMTPS id 4Vt7js2R6Vz3tqJ; Mon, 3 Jun 2024 11:30:09 +0200 (CEST) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4Vt7js0GWbz8sgS; Mon, 3 Jun 2024 11:30:08 +0200 (CEST) Received: from florianrock64 (ipb2186896.dynamic.kabel-deutschland.de [178.24.104.150]) by mxe217.netcup.net (Postfix) with ESMTPSA id 8945883C8C; Mon, 3 Jun 2024 11:30:02 +0200 (CEST) From: "pelzflorian (Florian Pelz)" <pelzflorian@HIDDEN> To: Oleg Pykhalov <go.wigust@HIDDEN> Subject: Re: [bug#71324] [PATCH] news: Add entry for 'docker-service-type' changes. In-Reply-To: <0ec66ae6dac10ef005782e8a1e9245b57e10d9d4.1717334243.git.go.wigust@HIDDEN> (Oleg Pykhalov's message of "Sun, 2 Jun 2024 16:17:51 +0300") References: <cover.1717333221.git.go.wigust@HIDDEN> <0ec66ae6dac10ef005782e8a1e9245b57e10d9d4.1717334243.git.go.wigust@HIDDEN> Date: Mon, 03 Jun 2024 11:30:01 +0200 Message-ID: <87wmn6cr1i.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: base64 X-Rspamd-Queue-Id: 8945883C8C X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: 6cRo8OMqz/h3qqXnUgsqT/+9fwTnK6qJSoAKokPP7KDI0RdBTr4gkLXI X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 71324 Cc: Julien Lepiller <julien@HIDDEN>, 71324 <at> debbugs.gnu.org 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 (-) VGhhbmsgeW91IGZvciB0aGUgY29udGFpbmVyZCBzZXJ2aWNlLCBPbGVnLg0KDQpUaGUgbWFpbiBw YXRjaOKAmXMgY29tbWl0IG1lc3NhZ2Ugc2hvdWxkIGNvbnRhaW4gdGhhdCB5b3UgY2hhbmdlZA0K ZG9jL2d1aXgudGV4aS4NCg0KSXQgaXMgbm90IGNsZWFyIHRvIG1lLCBpbiB0aGUgRW5nbGlzaCBu ZXdzLCB3aGVuIHlvdSB3cml0ZSDigJxNb3ZpbmcNCmZvcndhcmQsIHVzZXJzIGFyZSByZXF1aXJl ZCB0byBzcGVjaWZ5IGNvbnRhaW5lcmQgc2V0dGluZ3MgbWFudWFsbHkgZm9yDQp0aGVpciBjb25m aWd1cmF0aW9uc+KAnSwgZG8geW91IHJlYWxseSBtZWFuIHRoYXQgb25seSB1c2VycyAqd2l0aCBt YW51YWwNCmNvbmZpZ3VyYXRpb25zKiBhcmUgcmVxdWlyZWQgdG8gc3BlY2lmeSBjb250YWluZXJk IHNldHRpbmdzDQoqc2VwYXJhdGVseSo/DQoNCkNvdWxkIHlvdSBhZGQgdGhpcyBHZXJtYW4gdHJh bnNsYXRpb246DQoNCk9sZWcgUHlraGFsb3YgPGdvLndpZ3VzdEBnbWFpbC5jb20+IHdyaXRlczoN Cj4gKyAoZW50cnkgKGNvbW1pdCAiYmE5MzM5ZjU5ZmVjMWNkNDljOGQ0ZTlmMjY4MzQ4ODNmNWMx YWFlZCIpDQo+ICsgICAgICAgICh0aXRsZQ0KPiArICAgICAgICAgKGVuICJUaGUgY29udGFpbmVy ZCBzZXJ2aWNlIGlzIHNlcGFyYXRlZCBmcm9tDQo+IEBjb2Rle2RvY2tlci1zZXJ2aWNlLXR5cGV9 IikNCg0KKGRlICJjb250YWluZXJkIHd1cmRlIGVpbiBlaWdlbmVyIERpZW5zdCBsb3NnZWzDtnN0 IHZvbiBAY29kZXtkb2NrZXItc2VydmljZS10eXBlfSIpDQoNCj4gKyAgICAgICAgIChydSAi0KHQ tdGA0LLQuNGBIGNvbnRhaW5lcmQg0L7RgtC00LXQu9C10L0g0L7RgiBAY29kZXtkb2NrZXItc2Vy dmljZS10eXBlfSIpKQ0KPiArICAgICAgICAoYm9keQ0KPiArICAgICAgICAgKGVuICJjb250YWlu ZXJkIHNlcnZpY2UgaGFzIGJlZW4gZGVjb3VwbGVkIGZyb20gdGhlDQo+ICtAY29kZXtkb2NrZXIt c2VydmljZS10eXBlfS4gIE1vdmluZyBmb3J3YXJkLCB1c2VycyBhcmUgcmVxdWlyZWQgdG8gc3Bl Y2lmeQ0KPiArY29udGFpbmVyZCBzZXR0aW5ncyBtYW51YWxseSBmb3IgdGhlaXIgY29uZmlndXJh dGlvbnMuDQo+ICsNCj4gK1J1biBAY29tbWFuZHtpbmZvIFwiKGd1aXgpIE1pc2NlbGxhbmVvdXMg U2VydmljZXNcIn0gZm9yIG1vcmUgaW5mby4iKQ0KDQogICAgICAgICAgIChkZSAiRXMgZ2lidCBl aW5lbiBlaWdlbmVuIGNvbnRhaW5lcmQtRGllbnN0IGxvc2dlbMO2c3Qgdm9uDQpAY29kZXtkb2Nr ZXItc2VydmljZS10eXBlfS4gIEluIFp1a3VuZnQgbcO8c3NlbiBOdXR6ZXIgZG9ydCBtYW51ZWxs ZQ0KRWluc3RlbGx1bmdlbiBmw7xyIGNvbnRhaW5lcmQgdm9ybmVobWVuLg0KDQpTaWVoZSBAY29t bWFuZHtpbmZvIFwiKGd1aXguZGUpIFZlcnNjaGllZGVuZSBEaWVuc3RlXCJ9IGbDvHIgZ2VuYXVl cmUNCkluZm9ybWF0aW9uZW4uIikNCg0KDQoNCj4gKyAgICAgICAgIChydSAi0KHQtdGA0LLQuNGB IGNvbnRhaW5lcmQg0LHRi9C7INC+0YLQtNC10LvQtdC9INC+0YIgQGNvZGV7ZG9ja2VyLXNlcnZp Y2UtdHlwZX0uDQo+ICvQktC/0YDQtdC00Ywg0L/QvtC70YzQt9C+0LLQsNGC0LXQu9GP0Lwg0L/Q vtGC0YDQtdCx0YPQtdGC0YHRjyDRg9C60LDQt9GL0LLQsNGC0Ywg0L/QsNGA0LDQvNC10YLRgNGL IGNvbnRhaW5lcmQg0LLRgNGD0YfQvdGD0Y4g0LTQu9GPDQo+ICvRgdCy0L7QuNGFINC60L7QvdGE 0LjQs9GD0YDQsNGG0LjQuS4NCj4gKw0KPiAr0KHQvNC+0YLRgNC40YLQtSBAY29tbWFuZHtpbmZv IFwiKGd1aXgpIE1pc2NlbGxhbmVvdXMgU2VydmljZXNcIn0g0LTQu9GPINC/0L7Qu9GD0YfQtdC9 0LjRjyDQsdC+0LvQtdC1DQo+ICvQtNC10YLQsNC70YzQvdGL0YUg0YHQstC10LTQtdC90LjQuS4i KSkpDQoNCkkgcHJlc3VtZSB5b3Ugc2hvdWxkIGRpcmVjdCBSdXNzaWFuIHJlYWRlcnMgdG8NCkBj b21tYW5ke2luZm8gXCIoZ3VpeC5ydSkg0KDQsNC30L3QvtC+0LHRgNCw0LfQvdGL0LUg0YHQu9GD 0LbQsdGLXCJ9DQoNClJlZ2FyZHMsDQpGbG9yaWFuDQo=
guix-patches@HIDDEN:bug#71324; Package guix-patches.
Full text available.
Received: (at 71324) by debbugs.gnu.org; 2 Jun 2024 13:19:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jun 02 09:19:37 2024
Received: from localhost ([127.0.0.1]:58069 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sDl7Z-0003eg-8z
for submit <at> debbugs.gnu.org; Sun, 02 Jun 2024 09:19:37 -0400
Received: from mail-lj1-f178.google.com ([209.85.208.178]:37909)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <go.wigust@HIDDEN>) id 1sDl7X-0003eT-Ng
for 71324 <at> debbugs.gnu.org; Sun, 02 Jun 2024 09:19:36 -0400
Received: by mail-lj1-f178.google.com with SMTP id
38308e7fff4ca-2eaaa3be0c5so479061fa.0
for <71324 <at> debbugs.gnu.org>; Sun, 02 Jun 2024 06:19:23 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1717334297; x=1717939097; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=mtJiZTWm1zu0TbFkMWtk/O2zhm5w0JoHLDOohrgx3rY=;
b=Gik9XXwt7RzS6GoUFjkHGSV3LRyhRwSy7gKW8tlN/H9k+whhKLibDc8emTxURceFni
XVi7jjPewm8s2RkM2rpvxNXNo6PuvFb2WfJVXyyHCSwVoo39P1Ce0vVlfnhj8Q14doHD
QS9wa02Gu1ee4v/edss6Au7o9gj+RxLw7DxonDPy3ZpCMdQdxM/jI7SVU72W0RQg68MP
OfgZR7kzx/qdWpshHMQFjJYrAPt+Azr3UimT/KoHBqDbsyFwlMsjSuDB3Aq65nStufF7
OTD0XEkA5/sC57gO1d/BP9ZTPoLOYrTQ9dEUzW1QPIjd1Kp+sFEcB4zt/oOeMHEbhuRi
TsJg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1717334297; x=1717939097;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=mtJiZTWm1zu0TbFkMWtk/O2zhm5w0JoHLDOohrgx3rY=;
b=Y+WxtHDl14gw+hObsLAVYpA8L5a2KHoCL2AERW8mII/S62cInYR9pychbIy+tCARQm
fHzEH4QEMbh5kI498jf5KYUQ7shFf0CNy9Yie9HGXUrzHbm/JkxFJ+pwmQKHOdN/rAkx
yVLb0NAmoMvnRsRxt9Yp7CqAbD4mZnAZZ7LBpRYe3hK4HeCnG936yfj25jKuRrcv9EIJ
5Ve/HCb5LZhlSRNWUqhab25q3sXzGDeB9tPWW/WsRR/1WzKnuhc7Ea+rS8cFbi5Mltvg
+xCdHowqV+SJikvor3pgztCQMepvHCTfKiAiDNwD3tGOwelhAzkA7F3oYyzbRDbVE+YI
e1UA==
X-Gm-Message-State: AOJu0YzRh3/CeejcKaWxA7neGfTkd57KkFWBJtQCDgmW4XBt+y1C2VwX
8IqA/P7xCjVDK/7iNxC0y/uYjZN4YddSfxSFMUVYIiHSX7+Vp/rBXUO8Og==
X-Google-Smtp-Source: AGHT+IEp3BG1p43VLScswCUP9pg+pDFXM8gOjZ+bKb2vMoi2u2HNP55k2nLvu58dyaZGzXD2g2dhCw==
X-Received: by 2002:ac2:5921:0:b0:528:3de4:12c6 with SMTP id
2adb3069b0e04-52b896c5100mr3861748e87.4.1717334296492;
Sun, 02 Jun 2024 06:18:16 -0700 (PDT)
Received: from guixsd.wugi.info ([93.100.15.190])
by smtp.gmail.com with ESMTPSA id
2adb3069b0e04-52b84d8016fsm942215e87.214.2024.06.02.06.18.16
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 02 Jun 2024 06:18:16 -0700 (PDT)
From: Oleg Pykhalov <go.wigust@HIDDEN>
To: 71324 <at> debbugs.gnu.org
Subject: [PATCH] news: Add entry for 'docker-service-type' changes.
Date: Sun, 2 Jun 2024 16:17:51 +0300
Message-ID: <0ec66ae6dac10ef005782e8a1e9245b57e10d9d4.1717334243.git.go.wigust@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1717333221.git.go.wigust@HIDDEN>
References: <cover.1717333221.git.go.wigust@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>,
Julien Lepiller <julien@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 71324
Cc: Oleg Pykhalov <go.wigust@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 (-)
* etc/news.scm: Add entry.
Change-Id: I98d562d8b435b697b7c6529c5e788b5e2db9fa2a
---
etc/news.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/etc/news.scm b/etc/news.scm
index a511b7ffbc..3c11121161 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -31,6 +31,23 @@
(channel-news
(version 0)
+ (entry (commit "ba9339f59fec1cd49c8d4e9f26834883f5c1aaed")
+ (title
+ (en "The containerd service is separated from @code{docker-service-type}")
+ (ru "Сервис containerd отделен от @code{docker-service-type}"))
+ (body
+ (en "containerd service has been decoupled from the
+@code{docker-service-type}. Moving forward, users are required to specify
+containerd settings manually for their configurations.
+
+Run @command{info \"(guix) Miscellaneous Services\"} for more info.")
+ (ru "Сервис containerd был отделен от @code{docker-service-type}.
+Впредь пользователям потребуется указывать параметры containerd вручную для
+своих конфигураций.
+
+Смотрите @command{info \"(guix) Miscellaneous Services\"} для получения более
+детальных сведений.")))
+
(entry (commit "8d1d98a3aa3448b9d983e4bd64243a938b96e8ab")
(title
(en "@command{guix git authenticate} usage simplified")
--
2.41.0
pelzflorian@HIDDEN, julien@HIDDEN, guix-patches@HIDDEN:bug#71324; Package guix-patches.
Full text available.
Received: (at 71324) by debbugs.gnu.org; 2 Jun 2024 13:17:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jun 02 09:17:05 2024
Received: from localhost ([127.0.0.1]:58061 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1sDl56-0003az-CI
for submit <at> debbugs.gnu.org; Sun, 02 Jun 2024 09:17:05 -0400
Received: from mail-lj1-f170.google.com ([209.85.208.170]:40202)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <go.wigust@HIDDEN>) id 1sDl54-0003aQ-2o
for 71324 <at> debbugs.gnu.org; Sun, 02 Jun 2024 09:17:02 -0400
Received: by mail-lj1-f170.google.com with SMTP id
38308e7fff4ca-2eab062bbdeso142881fa.1
for <71324 <at> debbugs.gnu.org>; Sun, 02 Jun 2024 06:16:49 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1717334142; x=1717938942; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=CsPDLXvthB/bMsbqwvUfBMB7Bt90jhFxjp/Huc/T/b8=;
b=jU61060KB5TYUSFlskme9vNHdnq3fCijSbznT4slVYGl2gGiuCzKga1eQgwnlDWVbb
VNyunY9JIH5Txo+RuTGCF17EpWqIMbvQwrOpi2Tp3QAl8rj/Zh8lUsQ71tmx6vnNICMl
OQIT1u6ogebnxbp+LPp0NZAQD5ToYcOMGcdgjAc5t6oGi8j+A2zTVnlOZijR9W+7HT83
rFeAUFgrnBCAU6e9LwY+VFul3LAVSTskDtVdeD2G+47BjFwunHwpiupYzHD+YmgZPQ9Z
rvO2at1A7wYitTKfNlyFATmxy6u9HIkn5wLXBWZ6D1G5UEWXvl7kWJZRsYKUdsNo0izi
fvHw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1717334142; x=1717938942;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=CsPDLXvthB/bMsbqwvUfBMB7Bt90jhFxjp/Huc/T/b8=;
b=U6j+EaUH15Nh7teT1fYgsqqim/Shb5yq8lGHy8Q2CsiAuAWx+Y/XppWC8osVBvznHE
v7wS6lnppqkuDe9SvkLGY0g5tGVP/x66b2iQwYvC1+t5KW424MUFDnrOjlq99uhBXHPq
AbC02DUB32h8GWHkw81addnRZ7ZnDeR9L5WBuTvTfieosbJC8VROWmiWGvhpNPGTkSWb
ScCCpIo8QAEjv8+1mbdaKqDvN3lsm9UWCCxDxdBv+EQYGqmSJ+Sam3bMQU70xPFSO8lu
IZtYC1iIOI2CS2kN1k3QghOq/Lb3hmDN5p9o2/kP7wpCeyUDj3PJ963z21u634e9j9yH
fhUw==
X-Gm-Message-State: AOJu0YzjeH78z6wjw3L4t2AGcHsBYNUFe5OHnvkFtxcmX7aZ4wpmRr1/
PxjNbcPUOIBx4WfXzcYao0mJzjXcOaQxvraq7JK4aLkXCT4e2cvHUgacAg==
X-Google-Smtp-Source: AGHT+IFuTiFC/HOkvK3AaEWfymBPatM/7MoTSI4D0S3iiKZegbBXzANwOaDPnIXn+LkQdQhd3s7dhg==
X-Received: by 2002:a2e:984b:0:b0:2e9:8aa1:af89 with SMTP id
38308e7fff4ca-2ea95207270mr35895171fa.3.1717334141551;
Sun, 02 Jun 2024 06:15:41 -0700 (PDT)
Received: from guixsd.wugi.info ([93.100.15.190])
by smtp.gmail.com with ESMTPSA id
38308e7fff4ca-2ea91cc9d40sm9152411fa.93.2024.06.02.06.15.41
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 02 Jun 2024 06:15:41 -0700 (PDT)
From: Oleg Pykhalov <go.wigust@HIDDEN>
To: 71324 <at> debbugs.gnu.org
Subject: [PATCH] services: containerd: Provision separately from docker
service.
Date: Sun, 2 Jun 2024 16:15:11 +0300
Message-ID: <ba9339f59fec1cd49c8d4e9f26834883f5c1aaed.1717333221.git.go.wigust@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1717333221.git.go.wigust@HIDDEN>
References: <cover.1717333221.git.go.wigust@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.0 (/)
X-Debbugs-Envelope-To: 71324
Cc: Oleg Pykhalov <go.wigust@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 (-)
containerd can operate independently without relying on Docker for its
configuration.
* gnu/services/docker.scm (docker-configuration): Deprecate containerd field.
(containerd-configuration, containerd-service-type): New variables.
(docker-shepherd-service): Use containerd-configuration. Delete duplicated
variable binding. Allow to configure environment variables.
(docker-service-type): Delete extension with containerd-service-type.
* gnu/tests/docker.scm (%docker-os, %oci-os): Add containerd service.
(run-docker-test, run-docker-system-test, run-oci-container-test): Run
containerd service.
Change-Id: Ife0924e50a3e0aa2302d6592dae51ed894600004
---
doc/guix.texi | 39 ++++++++++++++++++++++-
gnu/services/docker.scm | 68 ++++++++++++++++++++++++++++-------------
gnu/tests/docker.scm | 46 +++++++++++++++++++++++++++-
3 files changed, 130 insertions(+), 23 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index c1ff049f03..d210a04d3a 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -40465,6 +40465,43 @@ Miscellaneous Services
The @code{(gnu services docker)} module provides the following services.
+@cindex containerd, container runtime
+@defvar containerd-service-type
+
+This service type operates containerd
+@url{https://containerd.io,containerd}, a daemon responsible for
+overseeing the entire container lifecycle on its host system. This
+includes image handling, storage management, container execution,
+supervision, low-level storage operations, network connections, and
+more.
+
+@end defvar
+
+@deftp {Data Type} containerd-configuration
+This is the data type representing the configuration of containerd.
+
+@table @asis
+
+@item @code{containerd} (default: @code{containerd})
+The containerd daemon package to use.
+
+@item @code{debug?} (default @code{#f})
+Enable or disable debug output.
+
+@item @code{environment-variables} (default: @code{'()})
+List of environment variables to set for @command{containerd}.
+
+This must be a list of strings where each string has the form
+@samp{@var{key}=@var{value}} as in this example:
+
+@lisp
+(list "HTTP_PROXY=socks5://127.0.0.1:9150"
+ "HTTPS_PROXY=socks5://127.0.0.1:9150")
+@end lisp
+
+@end table
+@end deftp
+
@defvar docker-service-type
This is the type of the service that runs @url{https://www.docker.com,Docker},
@@ -40485,7 +40522,7 @@ Miscellaneous Services
The Docker client package to use.
@item @code{containerd} (default: @var{containerd})
-The Containerd package to use.
+This field is deprecated in favor of @code{containerd-service-type} service.
@item @code{proxy} (default @var{docker-libnetwork-cmd-proxy})
The Docker user-land networking proxy package to use.
diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
index 7aff8dcc5f..a5375d1ccc 100644
--- a/gnu/services/docker.scm
+++ b/gnu/services/docker.scm
@@ -49,7 +49,9 @@ (define-module (gnu services docker)
#:use-module (ice-9 format)
#:use-module (ice-9 match)
- #:export (docker-configuration
+ #:export (containerd-configuration
+ containerd-service-type
+ docker-configuration
docker-service-type
singularity-service-type
oci-image
@@ -95,7 +97,7 @@ (define-configuration docker-configuration
"Docker client package.")
(containerd
(file-like containerd)
- "containerd package.")
+ "Deprecated. Do not use.")
(proxy
(file-like docker-libnetwork-cmd-proxy)
"The proxy package to support inter-container and outside-container
@@ -117,6 +119,18 @@ (define-configuration docker-configuration
"JSON configuration file to pass to dockerd")
(no-serialization))
+(define-configuration containerd-configuration
+ (containerd
+ (file-like containerd)
+ "containerd package.")
+ (debug?
+ (boolean #f)
+ "Enable or disable debug output.")
+ (environment-variables
+ (list '())
+ "Environment variables to set for containerd.")
+ (no-serialization))
+
(define %docker-accounts
(list (user-group (name "docker") (system? #t))))
@@ -134,24 +148,37 @@ (define (%docker-activation config)
(mkdir-p #$state-dir))))
(define (containerd-shepherd-service config)
- (let* ((package (docker-configuration-containerd config))
- (debug? (docker-configuration-debug? config))
- (containerd (docker-configuration-containerd config)))
+ (match-record config <containerd-configuration>
+ (containerd debug? environment-variables)
(shepherd-service
- (documentation "containerd daemon.")
- (provision '(containerd))
- (start #~(make-forkexec-constructor
- (list (string-append #$package "/bin/containerd")
- #$@(if debug?
- '("--log-level=debug")
- '()))
- ;; For finding containerd-shim binary.
- #:environment-variables
- (list (string-append "PATH=" #$containerd "/bin"))
- #:pid-file "/run/containerd/containerd.pid"
- #:pid-file-timeout 300
- #:log-file "/var/log/containerd.log"))
- (stop #~(make-kill-destructor)))))
+ (documentation "containerd daemon.")
+ (provision '(containerd))
+ (start #~(make-forkexec-constructor
+ (list (string-append #$containerd "/bin/containerd")
+ #$@(if debug?
+ '("--log-level=debug")
+ '()))
+ ;; For finding containerd-shim binary.
+ #:environment-variables
+ (list #$@environment-variables
+ (string-append "PATH=" #$containerd "/bin"))
+ #:pid-file "/run/containerd/containerd.pid"
+ #:pid-file-timeout 300
+ #:log-file "/var/log/containerd.log"))
+ (stop #~(make-kill-destructor)))))
+
+(define containerd-service-type
+ (service-type (name 'containerd)
+ (description "Run containerd container runtime.")
+ (extensions
+ (list
+ ;; Make sure the 'ctr' command is available.
+ (service-extension profile-service-type
+ (compose list containerd-configuration-containerd))
+ (service-extension shepherd-root-service-type
+ (lambda (config)
+ (list (containerd-shepherd-service config))))))
+ (default-value (containerd-configuration))))
(define (docker-shepherd-service config)
(let* ((docker (docker-configuration-docker config))
@@ -208,8 +235,7 @@ (define docker-service-type
%docker-activation)
(service-extension shepherd-root-service-type
(lambda (config)
- (list (containerd-shepherd-service config)
- (docker-shepherd-service config))))
+ (list (docker-shepherd-service config))))
(service-extension account-service-type
(const %docker-accounts))))
(default-value (docker-configuration))))
diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm
index d550136b4a..46c886580c 100644
--- a/gnu/tests/docker.scm
+++ b/gnu/tests/docker.scm
@@ -54,6 +54,7 @@ (define %docker-os
(service dbus-root-service-type)
(service polkit-service-type)
(service elogind-service-type)
+ (service containerd-service-type)
(service docker-service-type)))
(define (run-docker-test docker-tarball)
@@ -88,7 +89,21 @@ (define (run-docker-test docker-tarball)
(test-runner-current (system-test-runner #$output))
(test-begin "docker")
- (test-assert "service running"
+ (test-assert "containerd service running"
+ (marionette-eval
+ '(begin
+ (use-modules (gnu services herd))
+ (match (start-service 'containerd)
+ (#f #f)
+ (('service response-parts ...)
+ (match (assq-ref response-parts 'running)
+ ((pid) (number? pid))))))
+ marionette))
+
+ (test-assert "containerd PID file present"
+ (wait-for-file "/run/containerd/containerd.pid" marionette))
+
+ (test-assert "dockerd service running"
(marionette-eval
'(begin
(use-modules (gnu services herd))
@@ -234,6 +249,20 @@ (define (run-docker-system-test tarball)
(test-runner-current (system-test-runner #$output))
(test-begin "docker")
+ (test-assert "containerd service running"
+ (marionette-eval
+ '(begin
+ (use-modules (gnu services herd))
+ (match (start-service 'containerd)
+ (#f #f)
+ (('service response-parts ...)
+ (match (assq-ref response-parts 'running)
+ ((pid) (number? pid))))))
+ marionette))
+
+ (test-assert "containerd PID file present"
+ (wait-for-file "/run/containerd/containerd.pid" marionette))
+
(test-assert "service running"
(marionette-eval
'(begin
@@ -327,6 +356,7 @@ (define %oci-os
(service dbus-root-service-type)
(service polkit-service-type)
(service elogind-service-type)
+ (service containerd-service-type)
(service docker-service-type)
(extra-special-file "/shared.txt"
(plain-file "shared.txt" "hello"))
@@ -384,6 +414,20 @@ (define (run-oci-container-test)
(test-runner-current (system-test-runner #$output))
(test-begin "oci-container")
+ (test-assert "containerd service running"
+ (marionette-eval
+ '(begin
+ (use-modules (gnu services herd))
+ (match (start-service 'containerd)
+ (#f #f)
+ (('service response-parts ...)
+ (match (assq-ref response-parts 'running)
+ ((pid) (number? pid))))))
+ marionette))
+
+ (test-assert "containerd PID file present"
+ (wait-for-file "/run/containerd/containerd.pid" marionette))
+
(test-assert "dockerd running"
(marionette-eval
'(begin
--
2.41.0
pelzflorian@HIDDEN, ludo@HIDDEN, matt@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#71324; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 2 Jun 2024 13:05:12 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jun 02 09:05:12 2024 Received: from localhost ([127.0.0.1]:58025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sDktb-0003H8-QS for submit <at> debbugs.gnu.org; Sun, 02 Jun 2024 09:05:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:50434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <go.wigust@HIDDEN>) id 1sDktV-0003Gr-Kt for submit <at> debbugs.gnu.org; Sun, 02 Jun 2024 09:05:09 -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 <go.wigust@HIDDEN>) id 1sDktH-0000LB-CV for guix-patches@HIDDEN; Sun, 02 Jun 2024 09:04:53 -0400 Received: from mail-lj1-x22c.google.com ([2a00:1450:4864:20::22c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <go.wigust@HIDDEN>) id 1sDktF-0007oT-Ck for guix-patches@HIDDEN; Sun, 02 Jun 2024 09:04:50 -0400 Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2ea8e92c0b7so3230311fa.1 for <guix-patches@HIDDEN>; Sun, 02 Jun 2024 06:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717333486; x=1717938286; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iuJ7514Ie8QChZgMg/gQKZdFVPwASWml7pFhEcA8XaQ=; b=GzMfpXziqJ9R5pck72bMEdOrP7KhREkZpoAVwiwNyftw3pmoXaXJ4ZHYyHe9Beb5UT sVqA32OqU+Q31HN09IXxBb0MkprF7l7TJj+cNG7nDWexstupTZUiXEkP53ni9xEHvZOy cdLLaJoYK5oGv+DQehMA0R2SM5/GQIUL08MkJ014a+xaOAJT28xkkkb2CyIIfZuY00xc 6rpiOm/Opy5nI5qs6brTf88tOruB6bpncIKOx2NLpNgvnSTG0I8eSSg8Tq6mLovd4gyq dp/vot5h0vBa+mT7kyLsWanaNyJ7Hc2LRKm3pAAFlyss1eyogFBOIm80RjzqbxBv/jC3 +R9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717333486; x=1717938286; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iuJ7514Ie8QChZgMg/gQKZdFVPwASWml7pFhEcA8XaQ=; b=ay5oxsaMPvhUzD+xakO8s5eE3a8sNvZKwkt/kfoxN6aCQMGM6t0/ttKqraocKC1k9m EYARRnfoAVsPlfmTZxzSfQUlxtCgaF9zc+hKwaSrJ2okbDWvsH2FIPKzhXFmO8jKen72 1kdc+nYrJMg+zfLMMiGXLMBGrdC/He/Bd2KoFlYcABCg39OKKcX5+wtLtcHJB6GRECgN DuPRVnrcTW8sS6Tod6goIN32YMCQwYe8hr73irutknyJ4cyJwhMl+fPmV3qyUtC0C1OB b8mbHfx7cKlHsE5EEszaXEhl7KKfqcOT27PJRH4eR6G+/w5ts5iheSWiLJKO2eeg/20t uMvg== X-Gm-Message-State: AOJu0YzXpJ9zvLuDV/Pb+1jXxwQsyxAz4BSzlUVJ92GnvHAYoPPZGscK rWXSULt22rl+YoxAcEu3U+zePfJzk1P85jJBpHPnZDgfhnTe3qa24+kRRQ== X-Google-Smtp-Source: AGHT+IECzvuDmQSnLmTDOmfrHajHOt1mTDCn8IbVLRINdlvCeApW8NsrX6PdgjvnzIENwu6CH27ZRQ== X-Received: by 2002:a05:651c:21a:b0:2ea:7a79:fea5 with SMTP id 38308e7fff4ca-2ea950b55a3mr42657291fa.1.1717333486080; Sun, 02 Jun 2024 06:04:46 -0700 (PDT) Received: from guixsd.wugi.info ([93.100.15.190]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2ea91b9d65fsm9152911fa.27.2024.06.02.06.04.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jun 2024 06:04:45 -0700 (PDT) From: Oleg Pykhalov <go.wigust@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH] services: containerd: Provision separately from docker service. Date: Sun, 2 Jun 2024 16:04:17 +0300 Message-ID: <cover.1717333221.git.go.wigust@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: Florian Pelz <pelzflorian@HIDDEN>, Julien Lepiller <julien@HIDDEN> Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::22c; envelope-from=go.wigust@HIDDEN; helo=mail-lj1-x22c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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.3 (-) X-Debbugs-Envelope-To: submit Cc: Oleg Pykhalov <go.wigust@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.3 (--) containerd can now operate autonomously, decoupled from docker. While docker serves as a control interface for containerd, alternative controllers like nerdctl or kubelet offer viable options for managing containerization processes. Oleg Pykhalov (2): services: containerd: Provision separately from docker service. news: Add entry for ‘docker-service-type’ changes. doc/guix.texi | 39 ++++++++++++++++++++++- etc/news.scm | 17 +++++++++++ gnu/services/docker.scm | 68 ++++++++++++++++++++++++++++------------- gnu/tests/docker.scm | 46 +++++++++++++++++++++++++++- 4 files changed, 147 insertions(+), 23 deletions(-) base-commit: 6f72ad465c1e2df965e8d73b209497b4ef456527 -- 2.41.0
Oleg Pykhalov <go.wigust@HIDDEN>:pelzflorian@HIDDEN, julien@HIDDEN, guix-patches@HIDDEN.
Full text available.pelzflorian@HIDDEN, julien@HIDDEN, guix-patches@HIDDEN:bug#71324; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.