Merge pull request #278 from samos123/master

Add documentation format of environment variable
This commit is contained in:
Joffrey F 2014-07-22 13:22:18 +02:00
commit 8cdf6f49f3
1 changed files with 3 additions and 0 deletions

View File

@ -78,6 +78,9 @@ to those for the `docker run` command except it doesn't support the
attach options (`-a`). See "Port bindings" and "Using volumes" below for
more information on how to create port bindings and volume mappings.
The `environment` variable accepts a dictionary or a list of strings
in the following format `["PASSWORD=xxx"]` or `{"PASSWORD": "xxx"}`.
`volumes_from` and `dns` arguments raise TypeError exception if they are used
against v1.10 of docker remote API. Those arguments should be passed to
`start()` instead.