From patchwork Sun Aug 16 08:09:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 23632 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DB7FA27BBE6; Sun, 16 Aug 2020 09:10:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id A86A227BBE5 for ; Sun, 16 Aug 2020 09:10:08 +0100 (BST) Received: from localhost ([::1]:34620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7Dk0-0004ag-93 for patchwork@mira.cbaines.net; Sun, 16 Aug 2020 04:10:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7Dju-0004aO-Qk for guix-patches@gnu.org; Sun, 16 Aug 2020 04:10:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45283) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7Dju-0000Kp-Hc for guix-patches@gnu.org; Sun, 16 Aug 2020 04:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k7Dju-0004iH-CT for guix-patches@gnu.org; Sun, 16 Aug 2020 04:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42886] [PATCH 1/1] services: docker: Add 'enable-iptables?' argument. References: <20200816080616.5529-1-levenson@mmer.org> In-Reply-To: <20200816080616.5529-1-levenson@mmer.org> Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Aug 2020 08:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42886 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42886@debbugs.gnu.org Received: via spool by 42886-submit@debbugs.gnu.org id=B42886.159756535818061 (code B ref 42886); Sun, 16 Aug 2020 08:10:02 +0000 Received: (at 42886) by debbugs.gnu.org; 16 Aug 2020 08:09:18 +0000 Received: from localhost ([127.0.0.1]:56829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7DjB-0004hF-Rg for submit@debbugs.gnu.org; Sun, 16 Aug 2020 04:09:18 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:52951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7Dj7-0004h4-SB for 42886@debbugs.gnu.org; Sun, 16 Aug 2020 04:09:16 -0400 Received: from delta (92-109-1-225.cable.dynamic.v4.ziggo.nl [92.109.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id 36B2C9CC35 for <42886@debbugs.gnu.org>; Sun, 16 Aug 2020 07:38:27 +0000 (UTC) From: Alexey Abramov Date: Sun, 16 Aug 2020 10:09:07 +0200 Message-Id: <20200816080907.6106-1-levenson@mmer.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/docker.scm (docker-configuration): Define the argument. * gnu/services/docker.scm (docker-shepherd-service): Use it. Signed-off-by: Alexey Abramov --- gnu/services/docker.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index 937dff7bdb..98d9c4355b 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -56,7 +56,10 @@ loop-back communications.") "Enable or disable the user-land proxy (enabled by default).") (debug? (boolean #f) - "Enable or disable debug output.")) + "Enable or disable debug output.") + (enable-iptables? + (boolean #t) + "Enable addition of iptables rules (enabled by default)")) (define %docker-accounts (list (user-group (name "docker") (system? #t)))) @@ -91,6 +94,7 @@ loop-back communications.") (define (docker-shepherd-service config) (let* ((docker (docker-configuration-docker config)) (enable-proxy? (docker-configuration-enable-proxy? config)) + (enable-iptables? (docker-configuration-enable-iptables? config)) (proxy (docker-configuration-proxy config)) (debug? (docker-configuration-debug? config))) (shepherd-service @@ -115,7 +119,8 @@ loop-back communications.") '()) (if #$enable-proxy? "--userland-proxy" "") "--userland-proxy-path" (string-append #$proxy - "/bin/proxy")) + "/bin/proxy") + (if #$enable-iptables? "--iptables" "--iptables=false")) #:pid-file "/var/run/docker.pid" #:log-file "/var/log/docker.log")) (stop #~(make-kill-destructor)))))