kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 07:26:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

plugins/docker_daemon: only add PullDockerImages tasks when pull_images is set

Browse source
This commit is contained in:
Johan Euphrosine 2014-11-19 16:21:38 -08:00
parent 6fdf0cc403
commit e53e727c9c
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bootstrapvz/plugins/docker_daemon/__init__.py
View file

@ -22,4 +22,5 @@ def resolve_tasks(taskset, manifest):
taskset.add(tasks.AddDockerBinary) taskset.add(tasks.AddDockerBinary)
taskset.add(tasks.AddDockerInit) taskset.add(tasks.AddDockerInit)
taskset.add(tasks.EnableMemoryCgroup) taskset.add(tasks.EnableMemoryCgroup)
if len(manifest.plugins['docker_daemon'].get('pull_images', [])) > 0:
taskset.add(tasks.PullDockerImages) taskset.add(tasks.PullDockerImages)

2
bootstrapvz/plugins/docker_daemon/tasks.py
View file

@ -76,8 +76,6 @@ class PullDockerImages(Task):
@classmethod @classmethod
def run(cls, info): def run(cls, info):
images = info.manifest.plugins['docker_daemon'].get('pull_images', []) images = info.manifest.plugins['docker_daemon'].get('pull_images', [])
if len(pull_images) == 0:
return
retries = info.manifest.plugins['docker_daemon'].get('pull_images_retries', 10) retries = info.manifest.plugins['docker_daemon'].get('pull_images_retries', 10)
bin_docker = os.path.join(info.root, 'usr/bin/docker') bin_docker = os.path.join(info.root, 'usr/bin/docker')