Merge pull request #23415 from aboch/ll

Allow user to specify container's link-local addresses
Upstream-commit: c97fdbe3c5954b2685a8b140f595f06b09191956
Component: engine
This commit is contained in:
Michael Crosby
2016-06-14 15:47:54 -07:00
committed by GitHub
11 changed files with 107 additions and 29 deletions
@@ -54,6 +54,7 @@ Creates a new container.
-l, --label=[] Set metadata on the container (e.g., --label=com.example.key=value)
--label-file=[] Read in a line delimited file of labels
--link=[] Add link to another container
--link-local-ip=[] Container IPv4/IPv6 link-local addresses (e.g. 169.254.0.77, fe80::77)
--log-driver="" Logging driver for container
--log-opt=[] Log driver specific options
-m, --memory="" Memory limit
@@ -19,6 +19,7 @@ parent = "smn_cli"
--ip IPv4 Address
--ip6 IPv6 Address
--link=[] Add a link to another container
--link-local-ip=[] IPv4/IPv6 link-local addresses
Connects a container to a network. You can connect a container by name
or by ID. Once connected, the container can communicate with other containers in
@@ -55,6 +55,7 @@ parent = "smn_cli"
-l, --label=[] Set metadata on the container (e.g., --label=com.example.key=value)
--label-file=[] Read in a file of labels (EOL delimited)
--link=[] Add link to another container
--link-local-ip=[] Container IPv4/IPv6 link-local addresses (e.g. 169.254.0.77, fe80::77)
--log-driver="" Logging driver for container
--log-opt=[] Log driver specific options
-m, --memory="" Memory limit