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

Merge pull request #4713 from shin-/4710-project_dir_fix

Browse Source 
Fix Config.find for Compose files in nested folders
This commit is contained in:
Joffrey F 2017-04-10 14:39:37 -07:00 committed by GitHub
commit 2b61afb45f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compose/config/config.py
View File

@ -234,10 +234,10 @@ class ServiceConfig(namedtuple('_ServiceConfig', 'working_dir filename name conf
config) config)
def find(base_dir, filenames, environment, override_dir='.'): def find(base_dir, filenames, environment, override_dir=None):
if filenames == ['-']: if filenames == ['-']:
return ConfigDetails( return ConfigDetails(
os.path.abspath(override_dir), os.path.abspath(override_dir) if override_dir else os.getcwd(),
[ConfigFile(None, yaml.safe_load(sys.stdin))], [ConfigFile(None, yaml.safe_load(sys.stdin))],
environment environment
) )
@ -249,7 +249,7 @@ def find(base_dir, filenames, environment, override_dir='.'):
log.debug("Using configuration files: {}".format(",".join(filenames))) log.debug("Using configuration files: {}".format(",".join(filenames)))
return ConfigDetails( return ConfigDetails(
override_dir or os.path.dirname(filenames[0]), override_dir if override_dir else os.path.dirname(filenames[0]),
[ConfigFile.from_filename(f) for f in filenames], [ConfigFile.from_filename(f) for f in filenames],
environment environment
) )