summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Petazzoni <maxime.petazzoni@bulix.org>2014-02-05 13:29:46 -0800
committerMaxime Petazzoni <maxime.petazzoni@bulix.org>2014-02-05 13:29:46 -0800
commit417d6912680f7abcdbd9eb6f7ddcaf24d7e468ba (patch)
tree207761fb406fb15498c3c4ca2474f53e1a23e6d7
parent548b1e7f6cc60e8ece03f972ce21e83ad3a71906 (diff)
parentf7cef8a3e2b1f1b651189650496d76c1f163bd74 (diff)
downloaddocker-py-417d6912680f7abcdbd9eb6f7ddcaf24d7e468ba.tar.gz
Merge pull request #158 from a-ba/master
Fixed malformatted request when using empty list in create_container()
-rw-r--r--docker/client.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/client.py b/docker/client.py
index 9f2c952..6750098 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -133,7 +133,7 @@ class Client(requests.Session):
'{0}={1}'.format(k, v) for k, v in environment.items()
]
- if ports and isinstance(ports, list):
+ if isinstance(ports, list):
exposed_ports = {}
for port_definition in ports:
port = port_definition
@@ -145,7 +145,7 @@ class Client(requests.Session):
exposed_ports['{0}/{1}'.format(port, proto)] = {}
ports = exposed_ports
- if volumes and isinstance(volumes, list):
+ if isinstance(volumes, list):
volumes_dict = {}
for vol in volumes:
volumes_dict[vol] = {}