tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-25 22:54:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4588 from shin-/hholst80-feature/compose-file-separator

Browse Source 
Add environment variable to configure custom path separator when parsing COMPOSE_FILE entry
This commit is contained in:
Joffrey F 2017-03-09 15:35:44 -08:00 committed by GitHub
commit 7675553533
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compose/cli/command.py
View File

@ -54,7 +54,8 @@ def get_config_path_from_options(base_dir, options, environment):
config_files = environment.get('COMPOSE_FILE') config_files = environment.get('COMPOSE_FILE')
if config_files: if config_files:
return config_files.split(os.pathsep) pathsep = environment.get('COMPOSE_PATH_SEPARATOR', os.pathsep)
return config_files.split(pathsep)
return None return None

9
tests/unit/cli/command_test.py
View File

@ -45,6 +45,15 @@ class TestGetConfigPathFromOptions(object):
'.', {}, environment '.', {}, environment
) == ['one.yml', 'two.yml'] ) == ['one.yml', 'two.yml']
def test_multiple_path_from_env_custom_separator(self):
with mock.patch.dict(os.environ):
os.environ['COMPOSE_PATH_SEPARATOR'] = '^'
os.environ['COMPOSE_FILE'] = 'c:\\one.yml^.\\semi;colon.yml'
environment = Environment.from_env_file('.')
assert get_config_path_from_options(
'.', {}, environment
) == ['c:\\one.yml', '.\\semi;colon.yml']
def test_no_path(self): def test_no_path(self):
environment = Environment.from_env_file('.') environment = Environment.from_env_file('.')
assert not get_config_path_from_options('.', {}, environment) assert not get_config_path_from_options('.', {}, environment)