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

Get extended config path 

Refactored out into it's own function.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
This commit is contained in:
Mazz Mosley 2015-08-24 16:00:47 +01:00
parent 538a501eec
commit 37bf8235b7
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
compose/config/config.py
View File

@ -179,6 +179,9 @@ class ServiceLoader(object):
self.filename
)
self.extended_config_path = self.get_extended_config_path(
self.service_dict['extends']
)
def detect_cycle(self, name):
if self.signature(name) in self.already_seen:
@ -215,11 +218,7 @@ class ServiceLoader(object):
extends_options = self.service_dict['extends']
service_name = self.service_dict['name']
if 'file' in extends_options:
extends_from_filename = extends_options['file']
other_config_path = expand_path(self.working_dir, extends_from_filename)
else:
other_config_path = self.filename
other_config_path = self.get_extended_config_path(extends_options)
other_working_dir = os.path.dirname(other_config_path)
other_already_seen = self.already_seen + [self.signature(service_name)]
@ -252,6 +251,18 @@ class ServiceLoader(object):
return merge_service_dicts(other_service_dict, self.service_dict)
def get_extended_config_path(self, extends_options):
"""
Service we are extending either has a value for 'file' set, which we
need to obtain a full path too or we are extending from a service
defined in our own file.
"""
if 'file' in extends_options:
extends_from_filename = extends_options['file']
return expand_path(self.working_dir, extends_from_filename)
return self.filename
def signature(self, name):
return (self.filename, name)