mirror of https://github.com/docker/compose.git
Falling back to default project name when COMPOSE_PROJECT_NAME is set to empty
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
This commit is contained in:
parent
40d69675f3
commit
34ccb90d7e
|
@ -92,7 +92,7 @@ def get_project_name(working_dir, project_name=None):
|
|||
return re.sub(r'[^a-z0-9]', '', name.lower())
|
||||
|
||||
project_name = project_name or os.environ.get('COMPOSE_PROJECT_NAME')
|
||||
if project_name is not None:
|
||||
if project_name:
|
||||
return normalize_name(project_name)
|
||||
|
||||
project = os.path.basename(os.path.abspath(working_dir))
|
||||
|
|
|
@ -49,6 +49,13 @@ class CLITestCase(unittest.TestCase):
|
|||
project_name = get_project_name(None)
|
||||
self.assertEquals(project_name, name)
|
||||
|
||||
def test_project_name_with_empty_environment_var(self):
|
||||
base_dir = 'tests/fixtures/simple-composefile'
|
||||
with mock.patch.dict(os.environ):
|
||||
os.environ['COMPOSE_PROJECT_NAME'] = ''
|
||||
project_name = get_project_name(base_dir)
|
||||
self.assertEquals('simplecomposefile', project_name)
|
||||
|
||||
def test_get_project(self):
|
||||
base_dir = 'tests/fixtures/longer-filename-composefile'
|
||||
project = get_project(base_dir)
|
||||
|
|
Loading…
Reference in New Issue