From e53e727c9cd6c75883e7a67aa51223f0bf5a88d2 Mon Sep 17 00:00:00 2001 From: Johan Euphrosine Date: Wed, 19 Nov 2014 16:21:38 -0800 Subject: [PATCH] plugins/docker_daemon: only add PullDockerImages tasks when pull_images is set --- bootstrapvz/plugins/docker_daemon/__init__.py | 3 ++- bootstrapvz/plugins/docker_daemon/tasks.py | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bootstrapvz/plugins/docker_daemon/__init__.py b/bootstrapvz/plugins/docker_daemon/__init__.py index 5be1baa..637163e 100644 --- a/bootstrapvz/plugins/docker_daemon/__init__.py +++ b/bootstrapvz/plugins/docker_daemon/__init__.py @@ -22,4 +22,5 @@ def resolve_tasks(taskset, manifest): taskset.add(tasks.AddDockerBinary) taskset.add(tasks.AddDockerInit) taskset.add(tasks.EnableMemoryCgroup) - taskset.add(tasks.PullDockerImages) + if len(manifest.plugins['docker_daemon'].get('pull_images', [])) > 0: + taskset.add(tasks.PullDockerImages) diff --git a/bootstrapvz/plugins/docker_daemon/tasks.py b/bootstrapvz/plugins/docker_daemon/tasks.py index 9620f8d..c2bb25e 100644 --- a/bootstrapvz/plugins/docker_daemon/tasks.py +++ b/bootstrapvz/plugins/docker_daemon/tasks.py @@ -76,8 +76,6 @@ class PullDockerImages(Task): @classmethod def run(cls, info): 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) bin_docker = os.path.join(info.root, 'usr/bin/docker')