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

When extending, build replaces image and vice versa

Browse source 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2015-03-30 17:14:19 -04:00
commit 2a415ede08
2 changed files with 39 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compose/config.py
View file

@ -189,6 +189,12 @@ def merge_service_dicts(base, override):
override.get('volumes'),
)
if 'image' in override and 'build' in d:
del d['build']
if 'build' in override and 'image' in d:
del d['image']
for k in ALLOWED_KEYS:
if k not in ['environment', 'volumes']:
if k in override: