wip: poc docker compose

.github/workflows/ci.yml

@@ -1,8 +1,8 @@
 name: Node.js CI
 
-on: 
+on:
   push:
-    branches: 
+    branches:
       - '*'
   pull_request:
     branches:
@@ -12,20 +12,23 @@ jobs:
     runs-on: ubuntu-18.04
     name: Lint
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
-      with:
-        node-version: '12'
-    - run: yarn
-    - run: yarn lint
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '12'
+      - run: yarn
+      - run: yarn lint
   build:
     runs-on: ubuntu-18.04
     name: Build + Test
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
-      with:
-        node-version: '12'
-    - run: yarn
-    - run: yarn build
-    - run: yarn test
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '12'
+      - run: mkdir ~/.docker/cli-plugins
+      - run: curl -L -o ~/.docker/cli-plugins/docker-compose https://github.com/docker/compose-cli/releases/download/v2.0.0-beta.3/docker-compose-linux-amd64
+      - run: chmod +x ~/.docker/cli-plugins/docker-compose
+      - run: yarn
+      - run: yarn build
+      - run: yarn test

src/index.ts

@@ -122,7 +122,7 @@ const configToArgs = (config): string[] => {
  * Converts docker-compose commandline options to cli arguments
  */
 const composeOptionsToArgs = (composeOptions): string[] => {
-  let composeArgs: string[] = []
+  let composeArgs: string[] = ['compose']
 
   composeOptions.forEach((option: string[] | string): void => {
     if (option instanceof Array) {
@@ -136,6 +136,24 @@ const composeOptionsToArgs = (composeOptions): string[] => {
   return composeArgs
 }
 
+/**
+ * Converts docker-compose commandline options to cli arguments
+ */
+const commandOptionsToArgs = (commandOptions): string[] => {
+  let commandArgs: string[] = []
+
+  commandOptions.forEach((option: string[] | string): void => {
+    if (option instanceof Array) {
+      commandArgs = commandArgs.concat(option)
+    }
+    if (typeof option === 'string') {
+      commandArgs = commandArgs.concat([option])
+    }
+  })
+
+  return commandArgs
+}
+
 /**
  * Executes docker-compose command with common options
  */
@@ -156,13 +174,14 @@ export const execCompose = (
 
     composeArgs = composeArgs.concat(
       configArgs.concat(
-        [command].concat(composeOptionsToArgs(commandOptions), args)
+        [command].concat(commandOptionsToArgs(commandOptions), args)
       )
     )
 
     const cwd = options.cwd
     const env = options.env || undefined
-    const executablePath = options.executablePath || 'docker-compose'
+    const executablePath =
+      'docker' || options.executablePath || 'docker-compose'
 
     const childProc = childProcess.spawn(executablePath, composeArgs, {
       cwd,