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

Handle the 'network_mode' key when merging multiple compose files. 

Fixes docker/compose#2840.

Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
This commit is contained in:
Lukas Waslowski 2016-02-08 15:33:26 +01:00
parent 5a3a10d43b
commit 5bd88f634f
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

@ -87,6 +87,7 @@ ALLOWED_KEYS = DOCKER_CONFIG_KEYS + [
'container_name',
'dockerfile',
'logging',
'network_mode',
]
DOCKER_VALID_URL_PREFIXES = (