build: Update config overrides

maeek · Dec 19, 2021 · 7976a1e · 7976a1e
1 parent db9f1af
commit 7976a1e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 5 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,9 @@
+**/.git
+**/node_modules
+**/dist
+**/docs
+**/deploy
+**/config
+**/.vscode
+**/tools
+**/*.log
diff --git a/config/config.js b/config/config.js
@@ -2,7 +2,7 @@ const path = require('path');
 
 module.exports = {
   // Build mode: 'development' or 'production'
-  mode: process.env.NODE_ENV,
+  mode: process.env.NODE_ENV || 'production',
   // The base directory (absolute path!) for resolving the entry option
   basePath: path.resolve(__dirname, '..'),
   // Services folder

diff --git a/production/example/package.json b/production/example/package.json
@@ -44,7 +44,6 @@
   },
   "dockerBuildOptions": {
     "buildArgs": [
-      "--build-arg",
       "TEST_ARG=test"
     ]
   }

diff --git a/production/gateway/src/services/config/config.service.ts b/production/gateway/src/services/config/config.service.ts
@@ -6,7 +6,7 @@ export class ConfigService {
   constructor() {
     this.envConfig = {};
     this.envConfig.port = process.env.API_PORT;
-    
+
     this.envConfig.exampleService = {
       options: {
         port: process.env.API_PORT,

diff --git a/tools/build-all.js → tools/build.js b/tools/build-all.js → tools/build.js
diff --git a/tools/lib/Builder.js b/tools/lib/Builder.js
@@ -43,8 +43,8 @@ class Builder extends Command {
       `${this.config.realDockerfilePath ? this.config.realDockerfilePath : this.config.dockerfilePath}`,
       '--build-arg',
       `SERVICE_NAME=${this.name}`,
-      ...(conf.buildArgs || []),
-      ...(conf.environment || []),
+      ...(conf.buildArgs || []).map(arg => ['--build-arg', arg]).flat(Infinity),
+      ...(conf.environment || []).map(env => ['-e', env]).flat(Infinity),
       '-t',
       `${this.config.tag}`,
       'production/'

diff --git a/tools/new-service.js b/tools/new-service.js