tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add `compose.yaml/.yml` to default filenames 

Signed-off-by: Anca Iordache <anca.iordache@docker.com>
This commit is contained in:
Anca Iordache 2021-03-16 11:27:22 +01:00 committed by Nicolas De loof
parent 4a26d95de4
commit f5342b600c
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compose/config/config.py
View File

@ -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__)

3
tests/integration/environment_test.py
View File

@ -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

2
tests/unit/config/config_test.py
View File

@ -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):