docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Default link alias which is just the service name 

Closes #37.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2014-07-28 18:37:17 -07:00
parent 73bd4aca74
commit 62a4d214e8
2 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fig/service.py
View File

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

51
tests/integration/service_test.py
View File

@ -171,29 +171,62 @@ class ServiceTest(DockerClientTestCase):
def test_start_container_creates_links(self): def test_start_container_creates_links(self):
db = self.create_service('db') db = self.create_service('db')
web = self.create_service('web', links=[(db, None)]) web = self.create_service('web', links=[(db, None)])
db.start_container()
db.start_container() db.start_container()
web.start_container() web.start_container()
self.assertIn('figtest_db_1', web.containers()[0].links())
self.assertIn('db_1', web.containers()[0].links()) self.assertEqual(
set(web.containers()[0].links()),
set([
'figtest_db_1', 'db_1',
'figtest_db_2', 'db_2',
'db',
]),
)
def test_start_container_creates_links_with_names(self): def test_start_container_creates_links_with_names(self):
db = self.create_service('db') db = self.create_service('db')
web = self.create_service('web', links=[(db, 'custom_link_name')]) web = self.create_service('web', links=[(db, 'custom_link_name')])
db.start_container()
db.start_container() db.start_container()
web.start_container() web.start_container()
self.assertIn('custom_link_name', web.containers()[0].links())
self.assertEqual(
set(web.containers()[0].links()),
set([
'figtest_db_1', 'db_1',
'figtest_db_2', 'db_2',
'custom_link_name',
]),
)
def test_start_normal_container_does_not_create_links_to_its_own_service(self): def test_start_normal_container_does_not_create_links_to_its_own_service(self):
db = self.create_service('db') db = self.create_service('db')
c1 = db.start_container()
c2 = db.start_container() db.start_container()
self.assertNotIn(c1.name, c2.links()) db.start_container()
c = db.start_container()
self.assertEqual(set(c.links()), set([]))
def test_start_one_off_container_creates_links_to_its_own_service(self): def test_start_one_off_container_creates_links_to_its_own_service(self):
db = self.create_service('db') db = self.create_service('db')
c1 = db.start_container()
c2 = db.start_container(one_off=True) db.start_container()
self.assertIn(c1.name, c2.links()) db.start_container()
c = db.start_container(one_off=True)
self.assertEqual(
set(c.links()),
set([
'figtest_db_1', 'db_1',
'figtest_db_2', 'db_2',
'db',
]),
)
def test_start_container_builds_images(self): def test_start_container_builds_images(self):
service = Service( service = Service(