chore: env mgmt fixed while running service

gluestack · Jul 24, 2023 · eb849ae · eb849ae
1 parent fc3586f
commit eb849ae
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/packages/bolt/build/actions/service-up.js b/packages/bolt/build/actions/service-up.js
@@ -71,18 +71,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
                         console.log(chalk_1.default.yellow(`>> Given "${srOption}" service runner is not supported for ${serviceName}, using "${content.supported_service_runners[0]}" instead!`));
                         srOption = content.supported_service_runners[0];
                     }
-                    const { envfile: localENV } = content.service_runners["local"];
-                    const { envfile: dockerENV } = content.service_runners["docker"];
-                    const localENVPath = (0, path_1.join)(servicePath, localENV);
-                    const dockerENVPath = (0, path_1.join)(servicePath, dockerENV);
                     // generates .env
                     yield common_1.default.generateEnv();
                     // Make data interpolate into service-runner's yaml content from given env file :: LOCAL
                     if ((_a = content === null || content === void 0 ? void 0 : content.service_runners) === null || _a === void 0 ? void 0 : _a.local) {
+                        const { envfile } = content.service_runners["local"];
+                        const localENVPath = (0, path_1.join)(servicePath, envfile);
                         content.service_runners.local = yield (0, data_interpolate_1.default)(content.service_runners.local, localENVPath);
                     }
                     // Make data interpolate into service-runner's yaml content from given env file :: DOCKER
                     if ((_b = content === null || content === void 0 ? void 0 : content.service_runners) === null || _b === void 0 ? void 0 : _b.docker) {
+                        const { envfile } = content.service_runners["docker"];
+                        const dockerENVPath = (0, path_1.join)(servicePath, envfile);
                         content.service_runners.docker = yield (0, data_interpolate_1.default)(content.service_runners.docker, dockerENVPath);
                     }
                     let isConfigValid = false;

diff --git a/packages/bolt/build/index.js b/packages/bolt/build/index.js
diff --git a/packages/bolt/package.json b/packages/bolt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gluestack/bolt",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "Bolt Framework CLI",
   "main": "build/index.js",
   "bin": {

diff --git a/packages/bolt/src/actions/service-up.ts b/packages/bolt/src/actions/service-up.ts
@@ -86,24 +86,24 @@ export default class ServiceUp {
         srOption = content.supported_service_runners[0];
       }
 
-      const { envfile: localENV } = content.service_runners["local"];
-      const { envfile: dockerENV } = content.service_runners["docker"];
-
-      const localENVPath = join(servicePath, localENV);
-      const dockerENVPath = join(servicePath, dockerENV);
-
       // generates .env
       await Common.generateEnv();
 
       // Make data interpolate into service-runner's yaml content from given env file :: LOCAL
       if (content?.service_runners?.local) {
+        const { envfile } = content.service_runners["local"];
+        const localENVPath = join(servicePath, envfile);
+
         content.service_runners.local = await interpolate(
           content.service_runners.local, localENVPath
         );
       }
 
       // Make data interpolate into service-runner's yaml content from given env file :: DOCKER
       if (content?.service_runners?.docker) {
+        const { envfile } = content.service_runners["docker"];
+        const dockerENVPath = join(servicePath, envfile);
+
         content.service_runners.docker = await interpolate(
           content.service_runners.docker, dockerENVPath
         );