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

volumes_from is now a list from v.1.10

This commit is contained in:
Nicolas Delaby 2014-04-24 12:19:05 +02:00
parent ce782e190f
commit 380d7e8620
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/client.py
View File

@ -717,8 +717,8 @@ class Client(requests.Session):
if dns is not None:
start_config['Dns'] = dns
if volumes_from is not None:
if not isinstance(volumes_from, six.string_types):
volumes_from = ','.join(volumes_from)
if isinstance(volumes_from, six.string_types):
volumes_from = volumes_from.split(',')
start_config['VolumesFrom'] = volumes_from
else:
warning_message = ('{0!r} parameter is discarded. It is only'