not starting with -d when incompatible flags are set

aliko-str · AlexZeitler · commit b75d38e7e373 · 2024-04-08T01:57:23.000+02:00
diff --git a/src/index.ts b/src/index.ts
@@ -246,13 +246,16 @@ const shouldUseDefaultNonInteractiveFlag = function (
   options: IDockerComposeOptions = {}
 ): boolean {
   const commandOptions = options.commandOptions || []
+  const noDetachModeFlags = [
+    '--abort-on-container-exit',
+    '--no-start',
+    '--attach',
+    '--attach-dependencies',
+    '--exit-code-from'
+  ]
   const containsOtherNonInteractiveFlag = commandOptions.reduce(
     (memo: boolean, item: string | string[]) => {
-      return (
-        memo &&
-        !item.includes('--abort-on-container-exit') &&
-        !item.includes('--no-start')
-      )
+      return memo && noDetachModeFlags.every((flag) => !item.includes(flag))
     },
     true
   )
diff --git a/src/v2.ts b/src/v2.ts
@@ -341,13 +341,16 @@ const shouldUseDefaultNonInteractiveFlag = function (
   options: IDockerComposeOptions = {}
 ): boolean {
   const commandOptions = options.commandOptions || []
+  const noDetachModeFlags = [
+    '--abort-on-container-exit',
+    '--no-start',
+    '--attach',
+    '--attach-dependencies',
+    '--exit-code-from'
+  ]
   const containsOtherNonInteractiveFlag = commandOptions.reduce(
     (memo: boolean, item: string | string[]) => {
-      return (
-        memo &&
-        !item.includes('--abort-on-container-exit') &&
-        !item.includes('--no-start')
-      )
+      return memo && noDetachModeFlags.every((flag) => !item.includes(flag))
     },
     true
   )
diff --git a/test/v2/compose.test.ts b/test/v2/compose.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
+import { describe, it, expect, beforeEach, afterEach, vi, beforeAll } from 'vitest'
 import Docker, { ContainerInfo } from 'dockerode'
 import * as compose from '../../src/v2'
 import * as path from 'path'
@@ -1101,3 +1101,80 @@ describe('passed callback fn', (): void => {
     await compose.downAll(config)
   })
 })
+
+describe('when upAll is called', () => {
+  // relying on bash echo to know when a container is up and has its stdout forwarded to this process (aka, not --detach)
+  const ECHO_MSG = 'hello from a container tst msg'
+  const options2test = [
+    ['--attach', 'echo', true],
+    ['--exit-code-from', 'echo', true],
+    ['--abort-on-container-exit', 'echo', true],
+    ['--wait', 'echo', false]
+  ]
+
+  beforeAll(async () => {
+    await compose.downAll({
+      cwd: path.join(__dirname),
+      log: logOutput,
+      config: 'docker-compose-echo.yml'
+    })
+  })
+
+  afterEach(async () => {
+    await compose.kill({
+      cwd: path.join(__dirname),
+      log: logOutput,
+      config: 'docker-compose-echo.yml'
+    })
+  })
+
+  options2test.forEach((optPair) => {
+    it(`with ${optPair[0]}, a container gets started ${
+      optPair[2] ? 'not' : ''
+    } in the detached mode`, () => {
+      return new Promise((resolve, reject) => {
+        let doneFlag = false
+        compose
+          .upAll({
+            cwd: path.join(__dirname),
+            log: logOutput,
+            config: 'docker-compose-echo.yml',
+            commandOptions: [[optPair[0], optPair[1]]],
+            callback: (chunk, streamType) => {
+              if (
+                streamType === 'stdout' &&
+                !doneFlag &&
+                chunk.toString().includes('|') // else these are set-up messages, not echos from a container
+              ) {
+                doneFlag = true
+                expect(chunk.toString().includes(ECHO_MSG)).toBe(optPair[2])
+                optPair[2]
+                  ? resolve('all ok')
+                  : reject(
+                      `Container was run ${
+                        optPair[2] ? '' : 'not'
+                      } in the detached mode.`
+                    )
+              }
+            }
+          })
+          .then(() => {
+            optPair[2]
+              ? reject(
+                  `Container was run ${
+                    optPair[2] ? 'not' : ''
+                  } in the detached mode.`
+                )
+              : resolve('all ok')
+          })
+          .catch((e) => {
+            if (e.exitCode === 137) {
+              // swallowing this reject -- so it doesn't complain about being SIGKILLed
+              return
+            }
+            throw e // else re-throwing
+          })
+      })
+    })
+  })
+})
diff --git a/test/v2/docker-compose-echo.yml b/test/v2/docker-compose-echo.yml
@@ -0,0 +1,8 @@
+version: '2'
+
+services:
+  echo:
+    image: bash:devel-alpine3.19@sha256:cf3e4f54a774e9a896512766aa94934f9898444fa50827370767d461e6e7a41b
+    container_name: compose_test_web_2_hello_world
+    command: bash -c 'for i in {1..10}; do sleep 0.5 && echo "hello from a container tst msg"; done'
+
