changes as requested

MathiMP · Jun 21, 2024 · 1ce0373 · 1ce0373
1 parent c90ce09
commit 1ce0373
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/spec-node/dockerCompose.ts b/src/spec-node/dockerCompose.ts
@@ -703,30 +703,26 @@ export function dockerComposeCLIConfig(params: Omit<PartialExecParameters, 'cmd'
 	let result: Promise<DockerComposeCLI>;
 	return () => {
 		return result || (result = (async () => {
-			let v2 = false;
+			let v2 = true;
 			let stdout: Buffer;
-			dockerCLICmd='docker-compose';
 			try {
 				stdout = (await dockerComposeCLI({
 					...params,
-					cmd: dockerComposeCLICmd,
-				}, 'version', '--short')).stdout;
+					cmd: dockerCLICmd,
+				}, 'compose', 'version', '--short')).stdout;
+				v2 = true;
 			} catch (err) {
-				if (err?.code !== 'ENOENT') {
-					throw err;
-				}
 				stdout = (await dockerComposeCLI({
 					...params,
-					cmd: dockerCLICmd,
+					cmd: dockerComposeCLICmd,
 				}, 'version', '--short')).stdout;
-				v2 = true;
 			}
 			const version = stdout.toString().trim();
 			params.output.write(`Docker Compose version: ${version}`);
 			return {
 				version,
 				cmd: v2 ? dockerCLICmd : dockerComposeCLICmd,
-				args: v2 ? [] : ['compose'],
+				args: v2 ? ['compose'] : [],
 			};
 		})());
 	};