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

Revert "Merge pull request #711 from dnephin/fix_volumes_on_recreate"

Browse source 
This reverts commit 55095ef488, reversing
changes made to 72095f54b2.

Signed-off-by: Daniel Nephin <dnephin@yelp.com>
This commit is contained in:
Daniel Nephin 2015-01-20 12:01:50 -08:00
commit 2dd1cc80ca
4 changed files with 66 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

20
fig/project.py
View file

@ -176,14 +176,18 @@ class Project(object):
do_build=True):
running_containers = []
for service in self.get_services(service_names, include_links=start_links):
create_func = (service.recreate_containers if recreate
else service.start_or_create_containers)
for container in create_func(
insecure_registry=insecure_registry,
detach=detach,
do_build=do_build):
running_containers.append(container)
if recreate:
for (_, container) in service.recreate_containers(
insecure_registry=insecure_registry,
detach=detach,
do_build=do_build):
running_containers.append(container)
else:
for container in service.start_or_create_containers(
insecure_registry=insecure_registry,
detach=detach,
do_build=do_build):
running_containers.append(container)
return running_containers