Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-27 03:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Environment class cleanup

Browse source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-03-08 16:54:14 -08:00
parent fd020ed2cf
commit 1801f83bb8
7 changed files with 58 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compose/cli/command.py
View file

@ -34,7 +34,7 @@ def get_config_path_from_options(base_dir, options):
if file_option:
return file_option
environment = config.environment.Environment(base_dir)
environment = config.environment.Environment.from_env_file(base_dir)
config_files = environment.get('COMPOSE_FILE')
if config_files:
return config_files.split(os.pathsep)
@ -58,7 +58,7 @@ def get_project(project_dir, config_path=None, project_name=None, verbose=False,
config_details = config.find(project_dir, config_path)
project_name = get_project_name(config_details.working_dir, project_name)
config_data = config.load(config_details)
environment = config.environment.Environment(project_dir)
environment = config.environment.Environment.from_env_file(project_dir)
api_version = environment.get(
'COMPOSE_API_VERSION',
@ -75,7 +75,7 @@ def get_project_name(working_dir, project_name=None):
def normalize_name(name):
return re.sub(r'[^a-z0-9]', '', name.lower())
environment = config.environment.Environment(working_dir)
environment = config.environment.Environment.from_env_file(working_dir)
project_name = project_name or environment.get('COMPOSE_PROJECT_NAME')
if project_name:
return normalize_name(project_name)