jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2258 from dnephin/dont_link_when_using_networking

Browse source 
Fix running one-off containers with --x-networking
This commit is contained in:
mnowster 2015-10-27 15:32:20 +00:00
commit ffa2b08dbb
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compose/service.py
View file

@ -539,6 +539,9 @@ class Service(object):
return 1 if not numbers else max(numbers) + 1 return 1 if not numbers else max(numbers) + 1
def _get_links(self, link_to_self): def _get_links(self, link_to_self):
if self.use_networking:
return []
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():

8
tests/unit/service_test.py
View file

@ -499,6 +499,14 @@ class ServiceTest(unittest.TestCase):
ports=["127.0.0.1:1000-2000:2000-3000"]) ports=["127.0.0.1:1000-2000:2000-3000"])
self.assertEqual(service.specifies_host_port(), True) self.assertEqual(service.specifies_host_port(), True)
def test_get_links_with_networking(self):
service = Service(
'foo',
image='foo',
links=[(Service('one'), 'one')],
use_networking=True)
self.assertEqual(service._get_links(link_to_self=True), [])
class NetTestCase(unittest.TestCase): class NetTestCase(unittest.TestCase):