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

Fix running one-off containers with --x-networking by disabling linking to self.

Browse Source 
docker create fails if networking and links are used together.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-10-26 13:29:59 -04:00
parent a4b002a76e
commit 7878d38dee
2 changed files with 11 additions and 0 deletions
Show Stats 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):