From e5ecc9051ae14172acbab1e8b81e038f51a7bdf0 Mon Sep 17 00:00:00 2001 From: Jesse Dowell Date: Sat, 19 Sep 2020 12:40:38 -0400 Subject: [PATCH 3/4] services: docker-shepherd-service: 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index a4eccc7928..db7fdd5f4e 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -121,9 +121,9 @@ 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")) -- 2.28.0