From f5342b600c0c4bb8915f238212e66e57466b6bda Mon Sep 17 00:00:00 2001 From: Anca Iordache Date: Tue, 16 Mar 2021 11:27:22 +0100 Subject: [PATCH] Add `compose.yaml/.yml` to default filenames Signed-off-by: Anca Iordache --- compose/config/config.py | 7 ++++++- tests/integration/environment_test.py | 3 +-- tests/unit/config/config_test.py | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/compose/config/config.py b/compose/config/config.py index cd708bae3..3fec40197 100644 --- a/compose/config/config.py +++ b/compose/config/config.py @@ -149,9 +149,14 @@ DOCKER_VALID_URL_PREFIXES = ( SUPPORTED_FILENAMES = [ 'docker-compose.yml', 'docker-compose.yaml', + 'compose.yml', + 'compose.yaml', ] -DEFAULT_OVERRIDE_FILENAMES = ('docker-compose.override.yml', 'docker-compose.override.yaml') +DEFAULT_OVERRIDE_FILENAMES = ('docker-compose.override.yml', + 'docker-compose.override.yaml', + 'compose.override.yml', + 'compose.override.yaml') log = logging.getLogger(__name__) diff --git a/tests/integration/environment_test.py b/tests/integration/environment_test.py index 92e12e0d4..b7822a594 100644 --- a/tests/integration/environment_test.py +++ b/tests/integration/environment_test.py @@ -1,10 +1,9 @@ import tempfile +import pytest from ddt import data from ddt import ddt -import pytest - from .. import mock from ..acceptance.cli_test import dispatch from compose.cli.command import get_project diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py index 13a30e7bd..60b82dcf2 100644 --- a/tests/unit/config/config_test.py +++ b/tests/unit/config/config_test.py @@ -5235,6 +5235,8 @@ class GetDefaultConfigFilesTestCase(unittest.TestCase): files = [ 'docker-compose.yml', 'docker-compose.yaml', + 'compose.yml', + 'compose.yaml', ] def test_get_config_path_default_file_in_basedir(self):