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

Merge branch 'master' of https://github.com/dbdd4us/compose into dbdd4us-master

Browse source
This commit is contained in:
Joffrey F 2016-10-17 14:09:09 -07:00
commit 14716bc2da
9 changed files with 217 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compose/config/config.py
View file

@ -361,6 +361,9 @@ def load_mapping(config_files, get_func, entity_type):
config['driver_opts']
)
if 'labels' in config:
config['labels'] = parse_labels(config['labels'])
return mapping
@ -416,10 +419,11 @@ def load_services(config_details, config_file):
def interpolate_config_section(config_file, config, section, environment):
validate_config_section(config_file.filename, config, section)
return interpolate_environment_variables(
config_file.version,
config,
section,
environment)
config_file.version,
config,
section,
environment
)
def process_config_file(config_file, environment, service_name=None):