summaryrefslogtreecommitdiff
path: root/docs/api.md
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2015-06-16 17:07:47 -0700
committerJoffrey F <joffrey@docker.com>2015-06-16 17:07:47 -0700
commit06102f9fa80642945fe4312096ab071024787fed (patch)
tree9ae032f91fd0aba9e0488bb42f6d95ac89a76ed6 /docs/api.md
parenta1033b37211c6afe480c9e5db9c32ae47b67ca40 (diff)
parent5bda9da03632834c3b52c94097c087300f5d8ac0 (diff)
downloaddocker-py-1.3.0-dev.tar.gz
Merge branch 'lukemarsden-volume_driver' into 1.3.0-dev1.3.0-dev
Diffstat (limited to 'docs/api.md')
-rw-r--r--docs/api.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/api.md b/docs/api.md
index 573b041..4b64147 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -221,6 +221,7 @@ from. Optionally a single string joining container id's with commas
* host_config (dict): A [HostConfig](hostconfig.md) dictionary
* mac_address (str): The Mac Address to assign the container
* labels (dict or list): A dictionary of name-value labels (e.g. `{"label1": "value1", "label2": "value2"}`) or a list of names of labels to set with empty values (e.g. `["label1", "label2"]`)
+* volume_driver (str): The name of a volume driver/plugin.
**Returns** (dict): A dictionary with an image 'Id' key and a 'Warnings' key.