Documentation changes for labels

Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: fae92d5f0a1d81a48dc210d5ae28ef83c724b5ac
Component: engine
This commit is contained in:
Darren Shepherd
2015-03-16 13:28:55 -07:00
parent 703696a40f
commit 845f59abb0
10 changed files with 111 additions and 111 deletions

View File

@ -71,9 +71,8 @@ This endpoint now returns `SystemTime`, `HttpProxy`,`HttpsProxy` and `NoProxy`.
### What's new
**New!**
Build now has support for `LABEL` command which can be used to add user data
to an image. For example you could add data describing the content of an image.
The build supports `LABEL` command. Use this to add metadata
to an image. For example you could add data describing the content of an image.
`LABEL "com.example.vendor"="ACME Incorporated"`
@ -91,7 +90,7 @@ You can set labels on container create describing the container.
`GET /containers/json`
**New!**
This endpoint now returns the labels associated with each container (`Labels`).
The endpoint returns the labels associated with the containers (`Labels`).
`GET /containers/(id)/json`

View File

@ -195,8 +195,7 @@ Json Parameters:
- **OpenStdin** - Boolean value, opens stdin,
- **StdinOnce** - Boolean value, close stdin after the 1 attached client disconnects.
- **Env** - A list of environment variables in the form of `VAR=value`
- **Labels** - A map of labels and their values that will be added to the
container. It should be specified in the form `{"name":"value"[,"name2":"value2"]}`
- **Labels** - Adds a map of labels that to a container. To specify a map: `{"key":"value"[,"key2":"value2"]}`
- **Cmd** - Command to run specified as a string or an array of strings.
- **Entrypoint** - Set the entrypoint for the container a a string or an array
of strings