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

Correctly merge the 'services/<service>/networks' key in the case of multiple compose files.

Browse Source 
Fixes docker/compose#2839.

Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
This commit is contained in:
Lukas Waslowski 2016-02-08 15:17:21 +01:00 committed by Daniel Nephin
parent 8548b75582
commit c77a8cfe3b
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compose/config/config.py
View File

@ -698,6 +698,7 @@ def merge_service_dicts(base, override, version):
'depends_on', 'depends_on',
'expose', 'expose',
'external_links', 'external_links',
'networks',
'ports', 'ports',
'volumes_from', 'volumes_from',
]: ]: