tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-25 22:54:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Address old TODO, and small refactor of container name logic in service.

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-01-19 16:06:32 -05:00
parent cdda616d6b
commit 43ecf8793a
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compose/service.py
View File

@ -162,11 +162,11 @@ class Service(object):
- starts containers until there are at least `desired_num` running - starts containers until there are at least `desired_num` running
- removes all stopped containers - removes all stopped containers
""" """
if self.custom_container_name() and desired_num > 1: if self.custom_container_name and desired_num > 1:
log.warn('The "%s" service is using the custom container name "%s". ' log.warn('The "%s" service is using the custom container name "%s". '
'Docker requires each container to have a unique name. ' 'Docker requires each container to have a unique name. '
'Remove the custom name to scale the service.' 'Remove the custom name to scale the service.'
% (self.name, self.custom_container_name())) % (self.name, self.custom_container_name))
if self.specifies_host_port(): if self.specifies_host_port():
log.warn('The "%s" service specifies a port on the host. If multiple containers ' log.warn('The "%s" service specifies a port on the host. If multiple containers '
@ -496,10 +496,6 @@ class Service(object):
def get_volumes_from_names(self): def get_volumes_from_names(self):
return [s.source.name for s in self.volumes_from if isinstance(s.source, Service)] return [s.source.name for s in self.volumes_from if isinstance(s.source, Service)]
def get_container_name(self, number, one_off=False):
# TODO: Implement issue #652 here
return build_container_name(self.project, self.name, number, one_off)
# TODO: this would benefit from github.com/docker/docker/pull/14699 # TODO: this would benefit from github.com/docker/docker/pull/14699
# to remove the need to inspect every container # to remove the need to inspect every container
def _next_container_number(self, one_off=False): def _next_container_number(self, one_off=False):
@ -561,9 +557,7 @@ class Service(object):
for k in DOCKER_CONFIG_KEYS if k in self.options) for k in DOCKER_CONFIG_KEYS if k in self.options)
container_options.update(override_options) container_options.update(override_options)
if self.custom_container_name() and not one_off: if not container_options.get('name'):
container_options['name'] = self.custom_container_name()
elif not container_options.get('name'):
container_options['name'] = self.get_container_name(number, one_off) container_options['name'] = self.get_container_name(number, one_off)
container_options.setdefault('detach', True) container_options.setdefault('detach', True)
@ -706,9 +700,16 @@ class Service(object):
'{0}={1}'.format(LABEL_ONE_OFF, "True" if one_off else "False") '{0}={1}'.format(LABEL_ONE_OFF, "True" if one_off else "False")
] ]
@property
def custom_container_name(self): def custom_container_name(self):
return self.options.get('container_name') return self.options.get('container_name')
def get_container_name(self, number, one_off=False):
if self.custom_container_name and not one_off:
return self.custom_container_name
return build_container_name(self.project, self.name, number, one_off)
def remove_image(self, image_type): def remove_image(self, image_type):
if not image_type or image_type == ImageType.none: if not image_type or image_type == ImageType.none:
return False return False

4
tests/integration/service_test.py
View File

@ -782,7 +782,7 @@ class ServiceTest(DockerClientTestCase):
results in warning output. results in warning output.
""" """
service = self.create_service('app', container_name='custom-container') service = self.create_service('app', container_name='custom-container')
self.assertEqual(service.custom_container_name(), 'custom-container') self.assertEqual(service.custom_container_name, 'custom-container')
service.scale(3) service.scale(3)
@ -963,7 +963,7 @@ class ServiceTest(DockerClientTestCase):
def test_custom_container_name(self): def test_custom_container_name(self):
service = self.create_service('web', container_name='my-web-container') service = self.create_service('web', container_name='my-web-container')
self.assertEqual(service.custom_container_name(), 'my-web-container') self.assertEqual(service.custom_container_name, 'my-web-container')
container = create_and_start_container(service) container = create_and_start_container(service)
self.assertEqual(container.name, 'my-web-container') self.assertEqual(container.name, 'my-web-container')