feat(deploy): extra docker compose (#15)

makeomatic · Oct 3, 2019 · 44e3f12 · 44e3f12
1 parent f95254d
commit 44e3f12
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/bin/cmds/test.js b/bin/cmds/test.js
@@ -9,11 +9,17 @@ exports.builder = (yargs) => (
   yargs
     .commandDir('test_cmds')
     .option('docker_compose', {
-      type: 'array',
-      describe: 'docker-compose files for testing',
-      default: ['./test/docker-compose.yml'],
+      describe: 'docker-compose file for testing',
+      default: './test/docker-compose.yml',
       normalize: true,
     })
+    .option('docker_compose_multi', {
+      alias: 'dcm',
+      describe: 'docker-compose files that will be started in provided order',
+      type: 'string',
+      array: true,
+      default: [],
+    })
     .option('parallel', {
       type: 'number',
       description: 'run test suites in parallel',

diff --git a/bin/cmds/test_cmds/compose.js b/bin/cmds/test_cmds/compose.js
@@ -11,7 +11,7 @@ const {
 } = require('shelljs');
 
 const isWin = process.platform === 'win32';
-const withComposeFile = (filepaths) => `-f ${filepaths.join(' -f ')}`;
+const withComposeFile = (filepath) => `-f ${filepath}`;
 
 exports.command = 'compose';
 exports.desc = 'installs compose on the system';
@@ -62,6 +62,10 @@ exports.handler = (argv) => {
     }
   }
 
+  if (argv.docker_compose_multi.length > 0) {
+    dockerComposeFiles = `-f ${argv.docker_compose_multi.join(' -f ')}`;
+  }
+
   // add link to compose file
   argv.compose = ShellString(`"${compose}" ${dockerComposeFiles}`);