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

Containers join each network aliased to their service's name

Browse Source 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2016-01-14 18:33:35 +00:00
parent 2a2eb81215
commit abd031cb3d
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/const.py
View File

@ -18,7 +18,5 @@ COMPOSEFILE_VERSIONS = (1, 2)
API_VERSIONS = { API_VERSIONS = {
1: '1.21', 1: '1.21',
2: '1.22',
# TODO: update to 1.22 when there's a Docker 1.10 build to test against
2: '1.21',
} }

12
compose/service.py
View File

@ -427,7 +427,9 @@ class Service(object):
def connect_container_to_networks(self, container): def connect_container_to_networks(self, container):
for network in self.networks: for network in self.networks:
log.debug('Connecting "{}" to "{}"'.format(container.name, network)) log.debug('Connecting "{}" to "{}"'.format(container.name, network))
self.client.connect_container_to_network(container.id, network) self.client.connect_container_to_network(
container.id, network,
aliases=[self.name])
def remove_duplicate_containers(self, timeout=DEFAULT_TIMEOUT): def remove_duplicate_containers(self, timeout=DEFAULT_TIMEOUT):
for c in self.duplicate_containers(): for c in self.duplicate_containers():
@ -597,6 +599,8 @@ class Service(object):
override_options, override_options,
one_off=one_off) one_off=one_off)
container_options['networking_config'] = self._get_container_networking_config()
return container_options return container_options
def _get_container_host_config(self, override_options, one_off=False): def _get_container_host_config(self, override_options, one_off=False):
@ -631,6 +635,12 @@ class Service(object):
cpu_quota=options.get('cpu_quota'), cpu_quota=options.get('cpu_quota'),
) )
def _get_container_networking_config(self):
return self.client.create_networking_config({
network_name: self.client.create_endpoint_config(aliases=[self.name])
for network_name in self.networks
})
def build(self, no_cache=False, pull=False, force_rm=False): def build(self, no_cache=False, pull=False, force_rm=False):
log.info('Building %s' % self.name) log.info('Building %s' % self.name)

11
tests/acceptance/cli_test.py
View File

@ -133,12 +133,8 @@ class CLITestCase(DockerClientTestCase):
self.client.exec_start(exc) self.client.exec_start(exc)
return self.client.exec_inspect(exc)['ExitCode'] return self.client.exec_inspect(exc)['ExitCode']
def lookup(self, container, service_name): def lookup(self, container, hostname):
exit_code = self.execute(container, [ return self.execute(container, ["nslookup", hostname]) == 0
"nslookup",
"{}_{}_1".format(self.project.name, service_name)
])
return exit_code == 0
def test_help(self): def test_help(self):
self.base_dir = 'tests/fixtures/no-composefile' self.base_dir = 'tests/fixtures/no-composefile'
@ -414,6 +410,9 @@ class CLITestCase(DockerClientTestCase):
networks = list(container.get('NetworkSettings.Networks')) networks = list(container.get('NetworkSettings.Networks'))
self.assertEqual(networks, [network['Name']]) self.assertEqual(networks, [network['Name']])
for service in services:
assert self.lookup(container, service.name)
def test_up_with_networks(self): def test_up_with_networks(self):
self.base_dir = 'tests/fixtures/networks' self.base_dir = 'tests/fixtures/networks'
self.dispatch(['up', '-d'], None) self.dispatch(['up', '-d'], None)