Add env variables replacement in "project_name" configuration parameter

glavweb · Jan 23, 2022 · 68a0558 · 68a0558
1 parent 5f8475c
commit 68a0558
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/command-builder.js b/command-builder.js
@@ -87,7 +87,9 @@ CommandBuilder.prototype._build = function () {
 
     result = 'docker-compose';
 
-    result += ' -p ' + this.projectName;
+    if (this.projectName) {
+        result += ' -p ' + this.projectName;
+    }
 
     var i;
 

diff --git a/jake.js b/jake.js
@@ -33,8 +33,11 @@ try {
     var envConfig = config.environtments[env];
     var envReplace = require('./env-replace');
 
-    if ('project_name' in config) {
-        systemEnv.JAKE_PROJECT_NAME = config.project_name;
+    var projectName = systemEnv.JAKE_PROJECT_NAME || (config.project_name ? envReplace(config.project_name) : null);
+    var aliases = config.aliases || {};
+
+    if (projectName !== systemEnv.JAKE_PROJECT_NAME) {
+        systemEnv.JAKE_PROJECT_NAME = projectName;
     }
 
     for (var i = 0; i < envConfig.vars.length; i++) {
@@ -87,10 +90,16 @@ try {
         commandBuilder
             .setContainer(args.container)
             .setCmd(args.docker_compose, args.cmd)
-            .setAliases(config.aliases)
-            .setProjectName(config.project_name)
             .setEnv(env);
 
+        if (aliases) {
+          commandBuilder.setAliases(aliases);
+        }
+
+        if (projectName) {
+          commandBuilder.setProjectName(projectName);
+        }
+
         var interactive = envConfig.docker.interactive || args.interactive;
         var tty = envConfig.docker.tty || args.tty || process.stdout.isTTY;