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

Merge pull request #462 from tutumcloud/fix_create_host_config 

fix create_host_config method
This commit is contained in:
Joffrey F 2015-01-16 10:24:30 -08:00
parent aa19d7b660 3574167fb0
commit d3a2d900cb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/utils/utils.py
View File

@ -337,15 +337,15 @@ def create_host_config(
volumes_from = volumes_from.split(',') volumes_from = volumes_from.split(',')
host_config['VolumesFrom'] = volumes_from host_config['VolumesFrom'] = volumes_from
if binds: if binds is not None:
host_config['Binds'] = convert_volume_binds(binds) host_config['Binds'] = convert_volume_binds(binds)
if port_bindings: if port_bindings is not None:
host_config['PortBindings'] = convert_port_bindings( host_config['PortBindings'] = convert_port_bindings(
port_bindings port_bindings
) )
if extra_hosts: if extra_hosts is not None:
if isinstance(extra_hosts, dict): if isinstance(extra_hosts, dict):
extra_hosts = [ extra_hosts = [
'{0}:{1}'.format(k, v) '{0}:{1}'.format(k, v)
@ -354,7 +354,7 @@ def create_host_config(
host_config['ExtraHosts'] = extra_hosts host_config['ExtraHosts'] = extra_hosts
if links: if links is not None:
if isinstance(links, dict): if isinstance(links, dict):
links = six.iteritems(links) links = six.iteritems(links)
@ -370,7 +370,7 @@ def create_host_config(
formatted.append({'Key': k, 'Value': str(v)}) formatted.append({'Key': k, 'Value': str(v)})
lxc_conf = formatted lxc_conf = formatted
if lxc_conf: if lxc_conf is not None:
host_config['LxcConf'] = lxc_conf host_config['LxcConf'] = lxc_conf
return host_config return host_config