jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2851 from cr7pt0gr4ph7/2839-fix-networks-merging

Browse source 
Fix merge behavior for 'networks' and 'network_mode'.
This commit is contained in:
Aanand Prasad 2016-02-10 17:51:01 +00:00
commit 7b5bad6050
2 changed files with 47 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compose/config/config.py
View file

@ -87,6 +87,7 @@ ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
'container_name',
'dockerfile',
'logging',
'network_mode',
]
DOCKER_VALID_URL_PREFIXES = (
@ -698,6 +699,7 @@ def merge_service_dicts(base, override, version):
'depends_on',
'expose',
'external_links',
'networks',
'ports',
'volumes_from',
]: