unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#42886] [PATCH 0/1] Need a way to disable iptables for dockerd.
@ 2020-08-16  8:06 Alexey Abramov
  2020-08-16  8:09 ` [bug#42886] [PATCH 1/1] services: docker: Add 'enable-iptables?' argument Alexey Abramov
  0 siblings, 1 reply; 3+ messages in thread
From: Alexey Abramov @ 2020-08-16  8:06 UTC (permalink / raw)
  To: 42886

dockerd enables iptables by default, but if you are using nftables, you need
to disable iptables to make it work properly.

With this patch I want to add dockerd argument.

Alexey Abramov (1):
  services: docker: Add 'enable-iptables?' argument.

 gnu/services/docker.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--
2.27.0




^ permalink raw reply	[flat|nested] 3+ messages in thread

* [bug#42886] [PATCH 1/1] services: docker: Add 'enable-iptables?' argument.
  2020-08-16  8:06 [bug#42886] [PATCH 0/1] Need a way to disable iptables for dockerd Alexey Abramov
@ 2020-08-16  8:09 ` Alexey Abramov
  2020-08-16  9:15   ` bug#42886: " Mathieu Othacehe
  0 siblings, 1 reply; 3+ messages in thread
From: Alexey Abramov @ 2020-08-16  8:09 UTC (permalink / raw)
  To: 42886

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

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





^ permalink raw reply related	[flat|nested] 3+ messages in thread

* bug#42886: [PATCH 1/1] services: docker: Add 'enable-iptables?' argument.
  2020-08-16  8:09 ` [bug#42886] [PATCH 1/1] services: docker: Add 'enable-iptables?' argument Alexey Abramov
@ 2020-08-16  9:15   ` Mathieu Othacehe
  0 siblings, 0 replies; 3+ messages in thread
From: Mathieu Othacehe @ 2020-08-16  9:15 UTC (permalink / raw)
  To: Alexey Abramov; +Cc: 42886-done


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




^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-08-16  9:16 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-16  8:06 [bug#42886] [PATCH 0/1] Need a way to disable iptables for dockerd Alexey Abramov
2020-08-16  8:09 ` [bug#42886] [PATCH 1/1] services: docker: Add 'enable-iptables?' argument Alexey Abramov
2020-08-16  9:15   ` bug#42886: " Mathieu Othacehe

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).