Merge pull request #364 from docker/non-numeric-link-alias

Non-numeric link alias
This commit is contained in:
Ben Firshman 2014-09-04 20:39:18 +01:00
commit 2827786886
9 changed files with 68 additions and 23 deletions

View file

@ -273,12 +273,12 @@ class Service(object):
links = []
for service, link_name in self.links:
for container in service.containers():
if link_name:
links.append((container.name, link_name))
links.append((container.name, link_name or service.name))
links.append((container.name, container.name))
links.append((container.name, container.name_without_project))
if link_to_self:
for container in self.containers():
links.append((container.name, self.name))
links.append((container.name, container.name))
links.append((container.name, container.name_without_project))
return links