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

Don't set network mode when none is specified

Browse Source 
Setting a value overrides the new default network option.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2015-06-19 15:22:13 -07:00
parent 37ee6b0c19
commit c22cc02df5
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/project.py
View File

@ -188,7 +188,7 @@ class Project(object):
del service_dict['net'] del service_dict['net']
else: else:
net = 'bridge' net = None
return net return net

2
compose/service.py
View File

@ -457,7 +457,7 @@ class Service(object):
def _get_net(self): def _get_net(self):
if not self.net: if not self.net:
return "bridge" return None
if isinstance(self.net, Service): if isinstance(self.net, Service):
containers = self.net.containers() containers = self.net.containers()

12
tests/unit/project_test.py
View File

@ -209,6 +209,18 @@ class ProjectTest(unittest.TestCase):
], None) ], None)
self.assertEqual(project.get_service('test')._get_volumes_from(), container_ids) self.assertEqual(project.get_service('test')._get_volumes_from(), container_ids)
def test_net_unset(self):
mock_client = mock.create_autospec(docker.Client)
project = Project.from_dicts('test', [
{
'name': 'test',
'image': 'busybox:latest',
}
], mock_client)
service = project.get_service('test')
self.assertEqual(service._get_net(), None)
self.assertNotIn('NetworkMode', service._get_container_host_config({}))
def test_use_net_from_container(self): def test_use_net_from_container(self):
container_id = 'aabbccddee' container_id = 'aabbccddee'
container_dict = dict(Name='aaa', Id=container_id) container_dict = dict(Name='aaa', Id=container_id)