From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:700:3204::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id wKUWJJdBjWWk2QAAkFu2QA (envelope-from ) for ; Thu, 28 Dec 2023 10:36:23 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id aGkBHpdBjWWdSgEAe85BDQ (envelope-from ) for ; Thu, 28 Dec 2023 10:36:23 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="Gptg/2iX"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1703756183; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=FqwwHT2j1HNGCbZiTwt0THU6qly/WASGxI8+VgMGHDc=; b=IHHfNJaqtKzCu1/0lpusx0BFzyNEXiJI31TAfPjpzEVUY4QHYklwT7TccJcYauRg5oqdn6 YfjDb56dZ3A+qbl2IUETTgIY97eknuHJifCVU0rGw3UrtK8BHSPlY/HJGoXWbLXXt/M5xs U6MUXTSYPTUU3nSJrBVuLi3BDxfuYVjWTDAn1sf3vWqBVVFQiiGtoFZ4PgEkGe38TG8om+ queMFIXl1BnxUY8do352oJQe40uPAJaOZXy4uHb9S8e4dfeZG7Xxho4axqEpxbghGPkgMv OChRcR8Rqa1BwsdcgHDkM1L33dUVbjlBxk98mH+7ptwr2zYeKUzL1qUcamq8BQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="Gptg/2iX"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1703756183; a=rsa-sha256; cv=none; b=gWZpahapi7+JUb0r3FYjoakw6Fdm/cLcZGewLDWtO2OBW8VGiGUkzqfODJspYhXmYyTxGq Q+U2TS9e2iEBJ5WDn5ztLHwp9pIjRkK3/9vuB11UW4iEpLtm2KIEM3O7bXH17aNdXroj0E Qk9p7ZtHH0jfPqx0nZ9lPdj+IRPYlE1itlfk4Jj1ykgDgtgwhWEsP9L7IRnpK7EnKO95UJ bOkx4V6/Tg79MLqsF7UrCLSrPnS02Nupl+tUxd7lOSa5p6aTSa9c28N0Moqm2IJ9ZMWGqQ 42Gdekq+8VdCEAs4xyuQ/pYjjlyeGnjMwoomV927IOdYbPgknUy+7yvT6UX83Q== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 668A814EBB for ; Thu, 28 Dec 2023 10:36:23 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rImoB-0006TE-8F; Thu, 28 Dec 2023 04:36:07 -0500 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 ) id 1rImo8-0006Sx-Ch for guix-patches@gnu.org; Thu, 28 Dec 2023 04:36:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rImo7-0005WP-9J for guix-patches@gnu.org; Thu, 28 Dec 2023 04:36:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rImo6-0005aw-Dz for guix-patches@gnu.org; Thu, 28 Dec 2023 04:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68073] [PATCH] Add config-file configuration option to dockerd Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Dec 2023 09:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68073 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Connor Clark Cc: zimon.toutoune@gmail.com, paren@disroot.org, ludo@gnu.org, me@tobias.gr, rekado@elephly.net, rg@raghavgururajan.name, jgart@dismail.de, guix@cbaines.net, 68073@debbugs.gnu.org Received: via spool by 68073-submit@debbugs.gnu.org id=B68073.170375615221485 (code B ref 68073); Thu, 28 Dec 2023 09:36:02 +0000 Received: (at 68073) by debbugs.gnu.org; 28 Dec 2023 09:35:52 +0000 Received: from localhost ([127.0.0.1]:38492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rImnv-0005aT-Me for submit@debbugs.gnu.org; Thu, 28 Dec 2023 04:35:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rImnu-0005aC-BS for 68073@debbugs.gnu.org; Thu, 28 Dec 2023 04:35:50 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rImnm-0005Iy-VL; Thu, 28 Dec 2023 04:35:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=FqwwHT2j1HNGCbZiTwt0THU6qly/WASGxI8+VgMGHDc=; b=Gptg/2iXISQUh/fJ0DhN MKpPBhOniiCko7VXaxDveYa/7L8k5SYegqF+20oPKjR6E9FSEOmt3DPrXGF9KP/9F4mS9hrns7gRy gHIcN0VTO4pzMmbn6Rptferv7mOoSIcxGp8MuwKcrCWBPlKsffV/gl7wAnCl8P96H3HEcpS4mQwny fHv36ciBIB5BQjfDehzX+KjJVlHhmt9NW7wq2bKiJlgv2tuuhCgnBHqhokiqO8gQqCbm24nolIb8m mBWYMItbte17lPHchY5pawpYCJLobiWy+XuXZ1n4JjgdhdnW0EOwSlQHYNBbVENrj9gp0Bd6Vme3w 0NMo4Z72SEgWbQ==; From: Mathieu Othacehe In-Reply-To: <20231227203015.14265-1-connor@psyleft.com> (Connor Clark's message of "Wed, 27 Dec 2023 15:20:21 -0500") References: <20231227203015.14265-1-connor@psyleft.com> Date: Thu, 28 Dec 2023 10:35:40 +0100 Message-ID: <87plyq7jpv.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -5.43 X-Spam-Score: -5.43 X-Migadu-Queue-Id: 668A814EBB X-TUID: 8uODtOGmotCR Hello Connor, Thanks for this first submission and welcome :) > This is my first time submitting a patch here, so please let me know > if I'm missing something important, or my email is formatted > incorrectly, or anything else. This looks OK, a few remarks below: > This patch adds an option to pass a json configuration file directly into > dockerd for options which aren't available in the docker-configuration record, > of which there are many. From what I've seen, some other packages use a > raw-configuration-string that gets appended into a file to accomplish similar > things, but I figured a file-like was better here because the rest of the > options are passed into the command invocation and not serialized into a file. You are missing a commit message. Its format is described here: https://www.gnu.org/prep/standards/html_node/Change-Logs.html#Change-Logs Here that would look like: --8<---------------cut here---------------start------------->8--- * gnu/services/docker.scm (docker-configuration)[config-file]: New file-like field. ... --8<---------------cut here---------------end--------------->8--- You can have a look to the git log of that specific file for examples. If you want extra points, you can extend the system test in gnu/tests/docker.scm to check that the docker-service-type is honoring this new config-file field. Here is the documentation of system tests: https://guix.gnu.org/manual/en/html_node/Running-the-Test-Suite.html Could you please send a v2? Thanks, Mathieu