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

Extract link names into a function.

Browse source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-09-03 13:13:22 -04:00
commit db9f577ad6
4 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compose/cli/main.py
View file

@ -326,7 +326,7 @@ class TopLevelCommand(Command):
log.warn(INSECURE_SSL_WARNING)
if not options['--no-deps']:
deps = service.get_linked_names()
deps = service.get_linked_service_names()
if len(deps) > 0:
project.up(

13
compose/service.py
View file

@ -488,19 +488,22 @@ class Service(object):
return {
'options': self.options,
'image_id': self.image()['Id'],
'links': [(service.name, alias) for service, alias in self.links],
'links': self.get_link_names(),
'net': self.net.id,
'volumes_from': self.get_volumes_from_names(),
}
def get_dependency_names(self):
net_name = self.net.service_name
return (self.get_linked_names() +
return (self.get_linked_service_names() +
self.get_volumes_from_names() +
([net_name] if net_name else []))
def get_linked_names(self):
return [s.name for (s, _) in self.links]
def get_linked_service_names(self):
return [service.name for (service, _) in self.links]
def get_link_names(self):
return [(service.name, alias) for service, alias in self.links]
def get_volumes_from_names(self):
return [s.name for s in self.volumes_from if isinstance(s, Service)]
@ -784,7 +787,7 @@ class Net(object):
class ContainerNet(object):
"""A network mode that uses a containers network stack."""
"""A network mode that uses a container's network stack."""
service_name = None