mirror of
https://github.com/docker/docs.git
synced 2026-11-01 22:34:29 +03:00
Include network settings as part of the service config hash.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
@@ -498,7 +498,7 @@ class Service(object):
|
||||
'image_id': self.image()['Id'],
|
||||
'links': self.get_link_names(),
|
||||
'net': self.network_mode.id,
|
||||
'networks': list(self.networks.keys()),
|
||||
'networks': self.networks,
|
||||
'volumes_from': [
|
||||
(v.source.name, v.mode)
|
||||
for v in self.volumes_from if isinstance(v.source, Service)
|
||||
|
||||
@@ -285,7 +285,7 @@ class ServiceTest(unittest.TestCase):
|
||||
|
||||
self.assertEqual(
|
||||
opts['labels'][LABEL_CONFIG_HASH],
|
||||
'f8bfa1058ad1f4231372a0b1639f0dfdb574dafff4e8d7938049ae993f7cf1fc')
|
||||
'2524a06fcb3d781aa2c981fc40bcfa08013bb318e4273bfa388df22023e6f2aa')
|
||||
assert opts['environment'] == ['also=real']
|
||||
|
||||
def test_get_container_create_options_sets_affinity_with_binds(self):
|
||||
@@ -501,6 +501,7 @@ class ServiceTest(unittest.TestCase):
|
||||
image='example.com/foo',
|
||||
client=self.mock_client,
|
||||
network_mode=ServiceNetworkMode(Service('other')),
|
||||
networks={'default': None},
|
||||
links=[(Service('one'), 'one')],
|
||||
volumes_from=[VolumeFromSpec(Service('two'), 'rw', 'service')])
|
||||
|
||||
@@ -510,7 +511,7 @@ class ServiceTest(unittest.TestCase):
|
||||
'options': {'image': 'example.com/foo'},
|
||||
'links': [('one', 'one')],
|
||||
'net': 'other',
|
||||
'networks': [],
|
||||
'networks': {'default': None},
|
||||
'volumes_from': [('two', 'rw')],
|
||||
}
|
||||
assert config_dict == expected
|
||||
@@ -531,7 +532,7 @@ class ServiceTest(unittest.TestCase):
|
||||
'image_id': 'abcd',
|
||||
'options': {'image': 'example.com/foo'},
|
||||
'links': [],
|
||||
'networks': [],
|
||||
'networks': {},
|
||||
'net': 'aaabbb',
|
||||
'volumes_from': [],
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user