docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sanitize create_container input 

Client.create_container takes a volumes_from argument that should be: a
string, a list of strings, or None. If an empty list or dict is passed
instead, the docker daemon returns a 406 Client Error: Not Acceptable
This commit is contained in:
Felipe Bessa Coelho 2014-04-09 03:48:06 -03:00
parent 85ea42ecb3
commit 3198dd9fde
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/client.py
View File

@ -121,8 +121,12 @@ class Client(requests.Session):
volumes_dict[vol] = {}
volumes = volumes_dict
if volumes_from and not isinstance(volumes_from, six.string_types):
volumes_from = ','.join(volumes_from)
if volumes_from:
if not isinstance(volumes_from, six.string_types):
volumes_from = ','.join(volumes_from)
else:
# Force None, an empty list or dict causes client.start to fail
volumes_from = None
attach_stdin = False
attach_stdout = False