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

Make daemon to start with no userlandproxy by default 

This PR makes a user visible behavior change with userland
proxy disabled by default and rely on hairpin NAT to be enabled
by default. This may not work in older (unsupported) kernels
where the user will be forced to enable userlandproxy if needed.

      - Updated the Docs
      - Changed the integration-cli to start with userlandproxy
	desiabled by default.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
This commit is contained in:
Jana Radhakrishnan 2015-07-24 14:32:30 -07:00 committed by Tibor Vass
parent f5b80326a1
commit 3dff6170d6
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=true Use userland proxy for loopback traffic
--userland-proxy=false Use userland proxy for loopback traffic
Options with [] may be specified multiple times.

2
man/docker.1.md
View File

@ -161,7 +161,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 true.
Rely on a userland proxy implementation for inter-container and outside-to-container loopback communications. Default is false.
**-v**, **--version**=*true*|*false*
Print version information and quit. Default is false.