Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Make daemon to start with no userlandproxy by default" 

This reverts commit bf2b8ec8165468d7454f6bd86f4a78e7e8b58d8e.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
This commit is contained in:
Jessica Frazelle 2015-09-16 09:55:14 -07:00 committed by Tibor Vass
parent ccb5d7469a
commit 4948783f7c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/commandline/daemon.md
View File

@ -56,7 +56,7 @@ weight=1
--tlscert="~/.docker/cert.pem" Path to TLS certificate file
--tlskey="~/.docker/key.pem" Path to TLS key file
--tlsverify=false Use TLS and verify the remote
--userland-proxy=false Use userland proxy for loopback traffic
--userland-proxy=true Use userland proxy for loopback traffic
Options with [] may be specified multiple times.

2
man/docker.1.md
View File

@ -162,7 +162,7 @@ unix://[/path/to/socket] to use.
Default is false.
**--userland-proxy**=*true*|*false*
Rely on a userland proxy implementation for inter-container and outside-to-container loopback communications. Default is false.
Rely on a userland proxy implementation for inter-container and outside-to-container loopback communications. Default is true.
**-v**, **--version**=*true*|*false*
Print version information and quit. Default is false.