tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4669 from ucalgary/4517-preserve-deploy-options 

Merge deploy options in service dicts
This commit is contained in:
Joffrey F 2017-03-24 15:02:46 -07:00 committed by GitHub
parent 489074ac78 0e5acfa16c
commit 1b275b4f22
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/config/config.py
View File

@ -879,6 +879,7 @@ def merge_service_dicts(base, override, version):
md.merge_mapping('depends_on', parse_depends_on) md.merge_mapping('depends_on', parse_depends_on)
md.merge_sequence('links', ServiceLink.parse) md.merge_sequence('links', ServiceLink.parse)
md.merge_sequence('secrets', types.ServiceSecret.parse) md.merge_sequence('secrets', types.ServiceSecret.parse)
md.merge_mapping('deploy', parse_deploy)
for field in ['volumes', 'devices']: for field in ['volumes', 'devices']:
md.merge_field(field, merge_path_mappings) md.merge_field(field, merge_path_mappings)
@ -1003,6 +1004,7 @@ parse_sysctls = functools.partial(parse_dict_or_list, split_kv, 'sysctls')
parse_depends_on = functools.partial( parse_depends_on = functools.partial(
parse_dict_or_list, lambda k: (k, {'condition': 'service_started'}), 'depends_on' parse_dict_or_list, lambda k: (k, {'condition': 'service_started'}), 'depends_on'
) )
parse_deploy = functools.partial(parse_dict_or_list, split_kv, 'deploy')
def parse_ulimits(ulimits): def parse_ulimits(ulimits):

51
tests/unit/config/config_test.py
View File

@ -1950,6 +1950,57 @@ class ConfigTest(unittest.TestCase):
actual = config.merge_service_dicts(base, override, V3_1) actual = config.merge_service_dicts(base, override, V3_1)
assert actual['secrets'] == override['secrets'] assert actual['secrets'] == override['secrets']
def test_merge_deploy(self):
base = {
'image': 'busybox',
}
override = {
'deploy': {
'mode': 'global',
'restart_policy': {
'condition': 'on-failure'
}
}
}
actual = config.merge_service_dicts(base, override, V3_0)
assert actual['deploy'] == override['deploy']
def test_merge_deploy_override(self):
base = {
'image': 'busybox',
'deploy': {
'mode': 'global',
'restart_policy': {
'condition': 'on-failure'
},
'placement': {
'constraints': [
'node.role == manager'
]
}
}
}
override = {
'deploy': {
'mode': 'replicated',
'restart_policy': {
'condition': 'any'
}
}
}
actual = config.merge_service_dicts(base, override, V3_0)
assert actual['deploy'] == {
'mode': 'replicated',
'restart_policy': {
'condition': 'any'
},
'placement': {
'constraints': [
'node.role == manager'
]
}
}
def test_external_volume_config(self): def test_external_volume_config(self):
config_details = build_config_details({ config_details = build_config_details({
'version': '2', 'version': '2',