me
/
guix
Archived
1
0
Fork 0
Code

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>
master
Jesse Dowell 2020-09-19 12:40:38 -04:00 committed by Efraim Flashner
parent 87a13a5e30
commit f0a09310e6
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/services/docker.scm
View File

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