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

Merge pull request #2341 from dnephin/dont_create_default_network_sometimes

Browse source 
Only create the default network if at least one service needs it
This commit is contained in:
Daniel Nephin 2015-11-11 10:48:08 -05:00
commit c006c6ea09
4 changed files with 61 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compose/project.py
View file

@ -300,7 +300,7 @@ class Project(object):
plans = self._get_convergence_plans(services, strategy)
if self.use_networking:
if self.use_networking and self.uses_default_network():
self.ensure_network_exists()
return [
@ -383,7 +383,10 @@ class Project(object):
def remove_network(self):
network = self.get_network()
if network:
self.client.remove_network(network['id'])
self.client.remove_network(network['Id'])
def uses_default_network(self):
return any(service.net.mode == self.name for service in self.services)
def _inject_deps(self, acc, service):
dep_names = service.get_dependency_names()