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 #3334 from werehuman/fix-config-hash-change 

Fix #3248: Accidental config_hash change
This commit is contained in:
Aanand Prasad 2016-04-19 12:42:19 +01:00
parent 984f839d33 4702703615
commit cafe1315b2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/config/config.py
View File

@ -728,7 +728,7 @@ class MergeDict(dict):
merged = parse_sequence_func(self.base.get(field, [])) merged = parse_sequence_func(self.base.get(field, []))
merged.update(parse_sequence_func(self.override.get(field, []))) merged.update(parse_sequence_func(self.override.get(field, [])))
self[field] = [item.repr() for item in merged.values()] self[field] = [item.repr() for item in sorted(merged.values())]
def merge_scalar(self, field): def merge_scalar(self, field):
if self.needs_merge(field): if self.needs_merge(field):
@ -930,7 +930,7 @@ def dict_from_path_mappings(path_mappings):
def path_mappings_from_dict(d): def path_mappings_from_dict(d):
return [join_path_mapping(v) for v in d.items()] return [join_path_mapping(v) for v in sorted(d.items())]
def split_path_mapping(volume_path): def split_path_mapping(volume_path):