jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove extra ensure_image_exists() which causes duplicate builds.

Browse source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-04-08 11:59:06 -04:00
commit 275b54641a
4 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compose/project.py
View file

@ -309,12 +309,13 @@ class Project(object):
):
services = self.get_services_without_duplicate(service_names, include_deps=True)
for svc in services:
svc.ensure_image_exists(do_build=do_build)
plans = self._get_convergence_plans(services, strategy)
for service in services:
service.execute_convergence_plan(
plans[service.name],
do_build,
detached=True,
start=False)
@ -366,21 +367,19 @@ class Project(object):
remove_orphans=False):
self.initialize()
self.find_orphan_containers(remove_orphans)
services = self.get_services_without_duplicate(
service_names,
include_deps=start_deps)
plans = self._get_convergence_plans(services, strategy)
for svc in services:
svc.ensure_image_exists(do_build=do_build)
self.find_orphan_containers(remove_orphans)
plans = self._get_convergence_plans(services, strategy)
def do(service):
return service.execute_convergence_plan(
plans[service.name],
do_build=do_build,
timeout=timeout,
detached=detached
)

11
compose/service.py
View file

@ -254,7 +254,6 @@ class Service(object):
def create_container(self,
one_off=False,
do_build=BuildAction.none,
previous_container=None,
number=None,
quiet=False,
@ -263,7 +262,9 @@ class Service(object):
Create a container for this service. If the image doesn't exist, attempt to pull
it.
"""
self.ensure_image_exists(do_build=do_build)
# This is only necessary for `scale` and `volumes_from`
# auto-creating containers to satisfy the dependency.
self.ensure_image_exists()
container_options = self._get_container_create_options(
override_options,
@ -363,7 +364,6 @@ class Service(object):
def execute_convergence_plan(self,
plan,
do_build=BuildAction.none,
timeout=DEFAULT_TIMEOUT,
detached=False,
start=True):
@ -371,7 +371,7 @@ class Service(object):
should_attach_logs = not detached
if action == 'create':
container = self.create_container(do_build=do_build)
container = self.create_container()
if should_attach_logs:
container.attach_log_stream()
@ -385,7 +385,6 @@ class Service(object):
return [
self.recreate_container(
container,
do_build=do_build,
timeout=timeout,
attach_logs=should_attach_logs,
start_new_container=start
@ -412,7 +411,6 @@ class Service(object):
def recreate_container(
self,
container,
do_build=BuildAction.none,
timeout=DEFAULT_TIMEOUT,
attach_logs=False,
start_new_container=True):
@ -427,7 +425,6 @@ class Service(object):
container.stop(timeout=timeout)
container.rename_to_tmp_name()
new_container = self.create_container(
do_build=do_build,
previous_container=container,
number=container.labels.get(LABEL_CONTAINER_NUMBER),
quiet=True,