02/03: services: docker: Fix enable-proxy? option.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit f0a09310e6ff2ed63770cb585c551ba94ce4a9d0
Author: Jesse Dowell <jessedowell@gmail.com>
AuthorDate: Sat Sep 19 12:40:38 2020 -0400

    services: docker: Fix enable-proxy? option.
    
    The userland proxy option does not properly disable the userland proxy when
    set to false. Docker defaults to enabling the userland proxy if the option 
is
    unset on the command line.
    
    * gnu/services/docker.scm (docker-shepherd-service): Properly handle the
    'enable-proxy?' option.
    
    Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 gnu/services/docker.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
index a4eccc7..c7296d5 100644
--- a/gnu/services/docker.scm
+++ b/gnu/services/docker.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -121,9 +122,11 @@ loop-back communications.")
                            #$@(if debug?
                                   '("--debug" "--log-level=debug")
                                   '())
-                           (if #$enable-proxy? "--userland-proxy" "")
-                           "--userland-proxy-path" (string-append #$proxy
-                                                                  "/bin/proxy")
+                           #$@(if enable-proxy?
+                                  '("--userland-proxy=true"
+                                    (string-append
+                                      "--userland-proxy-path=" proxy 
"/bin/proxy"))
+                                  '("--userland-proxy=false"))
                            (if #$enable-iptables?
                                "--iptables"
                                "--iptables=false"))