Merge "docker-puppet: skip empty volume entries"
This commit is contained in:
commit
d0ef9ff26c
|
@ -205,7 +205,8 @@ def mp_puppet_config((config_volume, puppet_tags, manifest, config_image, volume
|
||||||
'--volume', '%s:%s:rw' % (sh_script, sh_script) ]
|
'--volume', '%s:%s:rw' % (sh_script, sh_script) ]
|
||||||
|
|
||||||
for volume in volumes:
|
for volume in volumes:
|
||||||
dcmd.extend(['--volume', volume])
|
if volume:
|
||||||
|
dcmd.extend(['--volume', volume])
|
||||||
|
|
||||||
dcmd.extend(['--entrypoint', sh_script])
|
dcmd.extend(['--entrypoint', sh_script])
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue