toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add NETWORK_NAME_or_ID value for --net= option

Browse Source 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 08328cb703c51ed4a2dfe985f618925fe3234080
Component: engine
This commit is contained in:
Wen Cheng Ma
2015-12-02 22:49:35 +08:00
parent 92e9c7bc6c
commit f2ea55aeff
7 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/man/docker-create.1.md
+5 -4
View File
@@ -221,10 +221,11 @@ This value should always larger than **-m**, so you should always use this with
**--net**="*bridge*"
Set the Network mode for the container
'bridge': creates a new network stack for the container on the docker bridge
'none': no networking for this container
'container:<name|id>': reuses another container network stack
'host': use the host network stack inside the container. Note: the host mode gives the container full access to local system services such as D-bus and is therefore considered insecure.
'bridge': create a network stack on the default Docker bridge
'none': no networking
'container:<name|id>': reuse another container's network stack
'host': use the Docker host network stack. Note: the host mode gives the container full access to local system services such as D-bus and is therefore considered insecure.
'<network-name>|<network-id>': connect to a user-defined network
**--oom-kill-disable**=*true*|*false*
Whether to disable OOM Killer for the container or not.
components/engine/man/docker-run.1.md
+5 -4
View File
@@ -333,10 +333,11 @@ and foreground Docker containers.
**--net**="*bridge*"
Set the Network mode for the container
'bridge': creates a new network stack for the container on the docker bridge
'none': no networking for this container
'container:<name|id>': reuses another container network stack
'host': use the host network stack inside the container. Note: the host mode gives the container full access to local system services such as D-bus and is therefore considered insecure.
'bridge': create a network stack on the default Docker bridge
'none': no networking
'container:<name|id>': reuse another container's network stack
'host': use the Docker host network stack. Note: the host mode gives the container full access to local system services such as D-bus and is therefore considered insecure.
'<network-name>|<network-id>': connect to a user-defined network
**--oom-kill-disable**=*true*|*false*
Whether to disable OOM Killer for the container or not.