summaryrefslogtreecommitdiff
path: root/docker/client.py
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 /docker/client.py
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 'docker/client.py')
-rw-r--r--docker/client.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/client.py b/docker/client.py
index 89e2841..c73e560 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -466,7 +466,7 @@ class Client(requests.Session):
network_disabled=False, name=None, entrypoint=None,
cpu_shares=None, working_dir=None, domainname=None,
memswap_limit=0, cpuset=None, host_config=None,
- mac_address=None, labels=None):
+ mac_address=None, labels=None, volume_driver=None):
if isinstance(volumes, six.string_types):
volumes = [volumes, ]
@@ -480,7 +480,8 @@ class Client(requests.Session):
self._version, image, command, hostname, user, detach, stdin_open,
tty, mem_limit, ports, environment, dns, volumes, volumes_from,
network_disabled, entrypoint, cpu_shares, working_dir, domainname,
- memswap_limit, cpuset, host_config, mac_address, labels
+ memswap_limit, cpuset, host_config, mac_address, labels,
+ volume_driver
)
return self.create_container_from_config(config, name)