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

Include network settings as part of the service config hash.

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-03-14 22:02:25 -04:00
parent 25cbc2aae9
commit 089ec66522
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/service.py
View File

@ -498,7 +498,7 @@ class Service(object):
'image_id': self.image()['Id'], 'image_id': self.image()['Id'],
'links': self.get_link_names(), 'links': self.get_link_names(),
'net': self.network_mode.id, 'net': self.network_mode.id,
'networks': list(self.networks.keys()), 'networks': self.networks,
'volumes_from': [ 'volumes_from': [
(v.source.name, v.mode) (v.source.name, v.mode)
for v in self.volumes_from if isinstance(v.source, Service) for v in self.volumes_from if isinstance(v.source, Service)

7
tests/unit/service_test.py
View File

@ -285,7 +285,7 @@ class ServiceTest(unittest.TestCase):
self.assertEqual( self.assertEqual(
opts['labels'][LABEL_CONFIG_HASH], opts['labels'][LABEL_CONFIG_HASH],
'f8bfa1058ad1f4231372a0b1639f0dfdb574dafff4e8d7938049ae993f7cf1fc') '2524a06fcb3d781aa2c981fc40bcfa08013bb318e4273bfa388df22023e6f2aa')
assert opts['environment'] == ['also=real'] assert opts['environment'] == ['also=real']
def test_get_container_create_options_sets_affinity_with_binds(self): def test_get_container_create_options_sets_affinity_with_binds(self):
@ -501,6 +501,7 @@ class ServiceTest(unittest.TestCase):
image='example.com/foo', image='example.com/foo',
client=self.mock_client, client=self.mock_client,
network_mode=ServiceNetworkMode(Service('other')), network_mode=ServiceNetworkMode(Service('other')),
networks={'default': None},
links=[(Service('one'), 'one')], links=[(Service('one'), 'one')],
volumes_from=[VolumeFromSpec(Service('two'), 'rw', 'service')]) volumes_from=[VolumeFromSpec(Service('two'), 'rw', 'service')])
@ -510,7 +511,7 @@ class ServiceTest(unittest.TestCase):
'options': {'image': 'example.com/foo'}, 'options': {'image': 'example.com/foo'},
'links': [('one', 'one')], 'links': [('one', 'one')],
'net': 'other', 'net': 'other',
'networks': [], 'networks': {'default': None},
'volumes_from': [('two', 'rw')], 'volumes_from': [('two', 'rw')],
} }
assert config_dict == expected assert config_dict == expected
@ -531,7 +532,7 @@ class ServiceTest(unittest.TestCase):
'image_id': 'abcd', 'image_id': 'abcd',
'options': {'image': 'example.com/foo'}, 'options': {'image': 'example.com/foo'},
'links': [], 'links': [],
'networks': [], 'networks': {},
'net': 'aaabbb', 'net': 'aaabbb',
'volumes_from': [], 'volumes_from': [],
} }