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

daemon: add --userland-proxy-path flag 

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-09-24 15:44:25 +02:00 committed by Tibor Vass
parent 9014b21a61
commit e9cb71acbb
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,7 @@ Options:
--tlskey=~/.docker/key.pem Path to TLS key file --tlskey=~/.docker/key.pem Path to TLS key file
--tlsverify Use TLS and verify the remote --tlsverify Use TLS and verify the remote
--userland-proxy=true Use userland proxy for loopback traffic --userland-proxy=true Use userland proxy for loopback traffic
--userland-proxy-path="" Path to the userland proxy binary
--userns-remap User/Group setting for user namespaces --userns-remap User/Group setting for user namespaces
-v, --version Print version information and quit -v, --version Print version information and quit
``` ```
@ -1149,6 +1150,7 @@ This is a full example of the allowed configuration options on Linux:
"ip-forward": false, "ip-forward": false,
"ip-masq": false, "ip-masq": false,
"userland-proxy": false, "userland-proxy": false,
"userland-proxy-path": "/usr/libexec/docker-proxy",
"ip": "0.0.0.0", "ip": "0.0.0.0",
"bridge": "", "bridge": "",
"bip": "", "bip": "",

4
man/dockerd.8.md
View File

@ -64,6 +64,7 @@ dockerd - Enable daemon mode
[**--tlskey**[=*~/.docker/key.pem*]] [**--tlskey**[=*~/.docker/key.pem*]]
[**--tlsverify**] [**--tlsverify**]
[**--userland-proxy**[=*true*]] [**--userland-proxy**[=*true*]]
[**--userland-proxy-path**[=*""*]]
[**--userns-remap**[=*default*]] [**--userns-remap**[=*default*]]
# DESCRIPTION # DESCRIPTION
@ -272,6 +273,9 @@ output otherwise.
**--userland-proxy**=*true*|*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 true.
**--userland-proxy-path**=""
Path to the userland proxy binary.
**--userns-remap**=*default*|*uid:gid*|*user:group*|*user*|*uid* **--userns-remap**=*default*|*uid:gid*|*user:group*|*user*|*uid*
Enable user namespaces for containers on the daemon. Specifying "default" will cause a new user and group to be created to handle UID and GID range remapping for the user namespace mappings used for contained processes. Specifying a user (or uid) and optionally a group (or gid) will cause the daemon to lookup the user and group's subordinate ID ranges for use as the user namespace mappings for contained processes. Enable user namespaces for containers on the daemon. Specifying "default" will cause a new user and group to be created to handle UID and GID range remapping for the user namespace mappings used for contained processes. Specifying a user (or uid) and optionally a group (or gid) will cause the daemon to lookup the user and group's subordinate ID ranges for use as the user namespace mappings for contained processes.