diff mbox series

[bug#42886,1/1] services: docker: Add 'enable-iptables?' argument.

Message ID 20200816080907.6106-1-levenson@mmer.org
State Accepted
Headers show
Series Need a way to disable iptables for dockerd. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job

Commit Message

Alexey Abramov Aug. 16, 2020, 8:09 a.m. UTC 
* gnu/services/docker.scm (docker-configuration): Define the argument.
* gnu/services/docker.scm (docker-shepherd-service): Use it.

Signed-off-by: Alexey Abramov <levenson@mmer.org>
---
 gnu/services/docker.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Mathieu Othacehe Aug. 16, 2020, 9:15 a.m. UTC | #1 
Hello,

> * gnu/services/docker.scm (docker-configuration): Define the argument.
> * gnu/services/docker.scm (docker-shepherd-service): Use it.

I added the corresponding documentation and pushed as
2b68a96422575b14e54c9a7e3d0033f6231a6b4d.

Thanks,

Mathieu
diff mbox series

Patch

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)))))