Revert "Add 'labels:' config option"
This reverts commit 721327110d.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
parent
02f119e4b7
commit
965426e39b
6 changed files with 3 additions and 75 deletions
|
|
@ -10,7 +10,7 @@ Compose with a `curl` command.
|
|||
|
||||
### Install Docker
|
||||
|
||||
First, install Docker version 1.6 or greater:
|
||||
First, install Docker version 1.3 or greater:
|
||||
|
||||
- [Instructions for Mac OS X](http://docs.docker.com/installation/mac/)
|
||||
- [Instructions for Ubuntu](http://docs.docker.com/installation/ubuntulinux/)
|
||||
|
|
|
|||
18
docs/yml.md
18
docs/yml.md
|
|
@ -253,24 +253,6 @@ db:
|
|||
> configuration options are **not** inherited - you will have to define
|
||||
> those manually each time you extend it.
|
||||
|
||||
### labels
|
||||
|
||||
Add metadata to containers using [Docker labels](http://docs.docker.com/userguide/labels-custom-metadata/). You can use either an array or a dictionary.
|
||||
|
||||
It's recommended that you use reverse-DNS notation to prevent your labels from conflicting with those used by other software.
|
||||
|
||||
```
|
||||
labels:
|
||||
com.example.description: "Accounting webapp"
|
||||
com.example.department: "Finance"
|
||||
com.example.label-with-empty-value: ""
|
||||
|
||||
labels:
|
||||
- "com.example.description=Accounting webapp"
|
||||
- "com.example.department=Finance"
|
||||
- "com.example.label-with-empty-value"
|
||||
```
|
||||
|
||||
### net
|
||||
|
||||
Networking mode. Use the same values as the docker client `--net` parameter.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue