From 995e5beda74b99dfc920f6a79aee977ff5a15a72 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Fri, 25 Mar 2016 11:16:19 -0700 Subject: [PATCH] docs for labels on build, networks and volumes Signed-off-by: Harald Albers --- docs/reference/commandline/build.md | 1 + docs/reference/commandline/network_create.md | 1 + docs/reference/commandline/volume_create.md | 1 + man/docker-build.1.md | 4 ++++ man/docker-network-create.1.md | 4 ++++ man/docker-volume-create.1.md | 4 ++++ 6 files changed, 15 insertions(+) diff --git a/docs/reference/commandline/build.md b/docs/reference/commandline/build.md index 2767497e9d..4530f77bb1 100644 --- a/docs/reference/commandline/build.md +++ b/docs/reference/commandline/build.md @@ -26,6 +26,7 @@ parent = "smn_cli" --force-rm Always remove intermediate containers --help Print usage --isolation="" Container isolation technology + --label=[] Set metadata for an image -m, --memory="" Memory limit for all build containers --memory-swap="" A positive integer equal to memory plus swap. Specify -1 to enable unlimited swap. --no-cache Do not use cache when building the image diff --git a/docs/reference/commandline/network_create.md b/docs/reference/commandline/network_create.md index 07df761efb..f44c5eff29 100644 --- a/docs/reference/commandline/network_create.md +++ b/docs/reference/commandline/network_create.md @@ -23,6 +23,7 @@ parent = "smn_cli" --ipam-driver=default IP Address Management Driver --ipam-opt=map[] Set custom IPAM driver specific options --ipv6 Enable IPv6 networking + --label=[] Set metadata on a network -o --opt=map[] Set custom driver specific options --subnet=[] Subnet in CIDR format that represents a network segment diff --git a/docs/reference/commandline/volume_create.md b/docs/reference/commandline/volume_create.md index da2c66de80..112c260a8b 100644 --- a/docs/reference/commandline/volume_create.md +++ b/docs/reference/commandline/volume_create.md @@ -16,6 +16,7 @@ parent = "smn_cli" -d, --driver=local Specify volume driver name --help Print usage + --label=[] Set metadata for a volume --name= Specify volume name -o, --opt=map[] Set driver specific options diff --git a/man/docker-build.1.md b/man/docker-build.1.md index 91f15fe0d4..c854bc1148 100644 --- a/man/docker-build.1.md +++ b/man/docker-build.1.md @@ -13,6 +13,7 @@ docker-build - Build a new image from the source code at PATH [**-f**|**--file**[=*PATH/Dockerfile*]] [**--force-rm**] [**--isolation**[=*default*]] +[**--label**[=*[]*]] [**--no-cache**] [**--pull**] [**-q**|**--quiet**] @@ -71,6 +72,9 @@ set as the **URL**, the repository is cloned locally and then sent as the contex **--isolation**="*default*" Isolation specifies the type of isolation technology used by containers. +**--label**=*label* + Set metadata for an image + **--no-cache**=*true*|*false* Do not use cache when building the image. The default is *false*. diff --git a/man/docker-network-create.1.md b/man/docker-network-create.1.md index 97505baf3b..885a109efd 100644 --- a/man/docker-network-create.1.md +++ b/man/docker-network-create.1.md @@ -15,6 +15,7 @@ docker-network-create - create a new network [**--ipam-driver**=*default*] [**--ipam-opt**=*map[]*] [**--ipv6**] +[**--label**[=*[]*]] [**-o**|**--opt**=*map[]*] [**--subnet**=*[]*] NETWORK-NAME @@ -156,6 +157,9 @@ If you want to create an externally isolated `overlay` network, you can specify **--ipv6** Enable IPv6 networking +**--label**=*label* + Set metadata for a network + **-o**, **--opt**=map[] Set custom driver options diff --git a/man/docker-volume-create.1.md b/man/docker-volume-create.1.md index 43338095c7..e71a2f1df1 100644 --- a/man/docker-volume-create.1.md +++ b/man/docker-volume-create.1.md @@ -8,6 +8,7 @@ docker-volume-create - Create a new volume **docker volume create** [**-d**|**--driver**[=*DRIVER*]] [**--help**] +[**--label**[=*[]*]] [**--name**[=*NAME*]] [**-o**|**--opt**[=*[]*]] @@ -51,6 +52,9 @@ Another example: **--help** Print usage statement +**--label**=*label* + Set metadata for a volume + **--name**="" Specify volume name