From 987e5e6d8a2627a91397e19d4313e4f9752dc2da Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Thu, 9 Jun 2016 15:10:59 -0700 Subject: [PATCH] Allow user to specify container's link-local addresses Signed-off-by: Alessandro Boch --- docs/reference/commandline/create.md | 1 + docs/reference/commandline/network_connect.md | 1 + docs/reference/commandline/run.md | 1 + docs/reference/run.md | 25 ++++++++++--------- man/docker-create.1.md | 4 +++ man/docker-run.1.md | 4 +++ 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/docs/reference/commandline/create.md b/docs/reference/commandline/create.md index 37769a02e7..0c62866fc3 100644 --- a/docs/reference/commandline/create.md +++ b/docs/reference/commandline/create.md @@ -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 diff --git a/docs/reference/commandline/network_connect.md b/docs/reference/commandline/network_connect.md index a815ca38ec..ae29c44bb3 100644 --- a/docs/reference/commandline/network_connect.md +++ b/docs/reference/commandline/network_connect.md @@ -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 diff --git a/docs/reference/commandline/run.md b/docs/reference/commandline/run.md index e1e98a02a9..1c38e27bc4 100644 --- a/docs/reference/commandline/run.md +++ b/docs/reference/commandline/run.md @@ -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 diff --git a/docs/reference/run.md b/docs/reference/run.md index f76336e67d..db0e86b6e9 100644 --- a/docs/reference/run.md +++ b/docs/reference/run.md @@ -288,18 +288,19 @@ of the containers. ## Network settings - --dns=[] : Set custom dns servers for the container - --net="bridge" : Connect a container to a network - 'bridge': create a network stack on the default Docker bridge - 'none': no networking - 'container:': reuse another container's network stack - 'host': use the Docker host network stack - '|': connect to a user-defined network - --net-alias=[] : Add network-scoped alias for the container - --add-host="" : Add a line to /etc/hosts (host:IP) - --mac-address="" : Sets the container's Ethernet device's MAC address - --ip="" : Sets the container's Ethernet device's IPv4 address - --ip6="" : Sets the container's Ethernet device's IPv6 address + --dns=[] : Set custom dns servers for the container + --net="bridge" : Connect a container to a network + 'bridge': create a network stack on the default Docker bridge + 'none': no networking + 'container:': reuse another container's network stack + 'host': use the Docker host network stack + '|': connect to a user-defined network + --net-alias=[] : Add network-scoped alias for the container + --add-host="" : Add a line to /etc/hosts (host:IP) + --mac-address="" : Sets the container's Ethernet device's MAC address + --ip="" : Sets the container's Ethernet device's IPv4 address + --ip6="" : Sets the container's Ethernet device's IPv6 address + --link-local-ip=[] : Sets one or more container's Ethernet device's link local IPv4/IPv6 addresses By default, all containers have networking enabled and they can make any outgoing connections. The operator can completely disable networking diff --git a/man/docker-create.1.md b/man/docker-create.1.md index e630d5fdcd..4dc90d89d8 100644 --- a/man/docker-create.1.md +++ b/man/docker-create.1.md @@ -43,6 +43,7 @@ docker-create - Create a new container [**-l**|**--label**[=*[]*]] [**--label-file**[=*[]*]] [**--link**[=*[]*]] +[**--link-local-ip**[=*[]*]] [**--log-driver**[=*[]*]] [**--log-opt**[=*[]*]] [**-m**|**--memory**[=*MEMORY*]] @@ -220,6 +221,9 @@ millions of trillions. Add link to another container in the form of :alias or just in which case the alias will match the name. +**--link-local-ip**=[] + Add one or more link-local IPv4/IPv6 addresses to the container's interface + **--log-driver**="*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*awslogs*|*splunk*|*etwlogs*|*gcplogs*|*none*" Logging driver for container. Default is defined by daemon `--log-driver` flag. **Warning**: the `docker logs` command works only for the `json-file` and diff --git a/man/docker-run.1.md b/man/docker-run.1.md index 2d02b7cbfb..055c8e6d67 100644 --- a/man/docker-run.1.md +++ b/man/docker-run.1.md @@ -45,6 +45,7 @@ docker-run - Run a command in a new container [**-l**|**--label**[=*[]*]] [**--label-file**[=*[]*]] [**--link**[=*[]*]] +[**--link-local-ip**[=*[]*]] [**--log-driver**[=*[]*]] [**--log-opt**[=*[]*]] [**-m**|**--memory**[=*MEMORY*]] @@ -326,6 +327,9 @@ container can access the exposed port via a private networking interface. Docker will set some environment variables in the client container to help indicate which interface and port to use. +**--link-local-ip**=[] + Add one or more link-local IPv4/IPv6 addresses to the container's interface + **--log-driver**="*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*awslogs*|*splunk*|*etwlogs*|*gcplogs*|*none*" Logging driver for container. Default is defined by daemon `--log-driver` flag. **Warning**: the `docker logs` command works only for the `json-file` and