From d2442e6b34e7291ad76b94a9c35a13c2d50d1442 Mon Sep 17 00:00:00 2001 From: Zak Wheaton Date: Wed, 6 Sep 2017 11:39:28 -0700 Subject: [PATCH] references the base config dir rather than the created dict --- dojo/run.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dojo/run.py b/dojo/run.py index ba88cf3..c3263f5 100644 --- a/dojo/run.py +++ b/dojo/run.py @@ -16,6 +16,7 @@ class Entrypoint(object): def run(self, name, runner, config, env): # Build base config from core yml and jobs files. + config_dir = config base_config_path = os.path.join(config, 'config.yml') base_config = self._read_yaml(base_config_path) or {} if 'jobs' not in base_config: @@ -31,7 +32,7 @@ class Entrypoint(object): config = deep_merge(base_config, env_config) # Build secrets by decrypting available EJSONs. - env_ejson_secrets_path = os.path.join(config, 'secrets.%s.ejson' % (env, )) + env_ejson_secrets_path = os.path.join(config_dir, 'secrets.%s.ejson' % (env, )) env_ejson_secrets = self._read_json(env_ejson_secrets_path) ejson_public_key = env_ejson_secrets['_public_key'] ejson_private_key_path = os.path.join('/opt/ejson/keys/%s' % (ejson_public_key, )) -- GitLab