From 3b02426236787032185feafb507da480e6d2df62 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Fri, 7 Apr 2017 12:19:37 -0700 Subject: [PATCH] Fix Config.find for Compose files in nested folders Signed-off-by: Joffrey F --- compose/config/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compose/config/config.py b/compose/config/config.py index 3292845f5..0c514763a 100644 --- a/compose/config/config.py +++ b/compose/config/config.py @@ -234,10 +234,10 @@ class ServiceConfig(namedtuple('_ServiceConfig', 'working_dir filename name conf config) -def find(base_dir, filenames, environment, override_dir='.'): +def find(base_dir, filenames, environment, override_dir=None): if filenames == ['-']: 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))], environment ) @@ -249,7 +249,7 @@ def find(base_dir, filenames, environment, override_dir='.'): log.debug("Using configuration files: {}".format(",".join(filenames))) 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], environment )