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

Container.name strips the leading slash

This commit is contained in:
Aanand Prasad 2013-12-20 19:33:41 +00:00
parent 8291d36eaf
commit 13a30c327a
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plum/container.py
View File

@ -45,7 +45,7 @@ class Container(object):
@property
def name(self):
return self.dictionary['Name']
return self.dictionary['Name'][1:]
@property
def human_readable_ports(self):
@ -123,7 +123,7 @@ class Container(object):
for container in self.client.containers():
for name in container['Names']:
bits = name.split('/')
if len(bits) > 2 and bits[1] == self.name[1:]:
if len(bits) > 2 and bits[1] == self.name:
links.append(bits[2])
return links

2
plum/service.py
View File

@ -121,7 +121,7 @@ class Service(object):
links = {}
for service in self.links:
for container in service.containers():
links[container.name[1:]] = container.name[1:]
links[container.name] = container.name
return links
def _get_container_options(self, override_options, one_off=False):

12
tests/service_test.py
View File

@ -29,7 +29,7 @@ class ServiceTest(DockerClientTestCase):
foo.start_container()
self.assertEqual(len(foo.containers()), 1)
self.assertEqual(foo.containers()[0].name, '/default_foo_1')
self.assertEqual(foo.containers()[0].name, 'default_foo_1')
self.assertEqual(len(bar.containers()), 0)
bar.start_container()
@ -39,8 +39,8 @@ class ServiceTest(DockerClientTestCase):
self.assertEqual(len(bar.containers()), 2)
names = [c.name for c in bar.containers()]
self.assertIn('/default_bar_1', names)
self.assertIn('/default_bar_2', names)
self.assertIn('default_bar_1', names)
self.assertIn('default_bar_2', names)
def test_containers_one_off(self):
db = self.create_service('db')
@ -51,7 +51,7 @@ class ServiceTest(DockerClientTestCase):
def test_project_is_added_to_container_name(self):
service = self.create_service('web', project='myproject')
service.start_container()
self.assertEqual(service.containers()[0].name, '/myproject_web_1')
self.assertEqual(service.containers()[0].name, 'myproject_web_1')
def test_start_stop(self):
service = self.create_service('scalingtest')
@ -92,13 +92,13 @@ class ServiceTest(DockerClientTestCase):
def test_create_container_with_one_off(self):
db = self.create_service('db')
container = db.create_container(one_off=True)
self.assertEqual(container.name, '/default_db_run_1')
self.assertEqual(container.name, 'default_db_run_1')
def test_create_container_with_one_off_when_existing_container_is_running(self):
db = self.create_service('db')
db.start()
container = db.create_container(one_off=True)
self.assertEqual(container.name, '/default_db_run_1')
self.assertEqual(container.name, 'default_db_run_1')
def test_start_container_passes_through_options(self):
db = self.create_service('db')