Skip to content

Commit 1ce0373

Browse files
committed
changes as requested
1 parent c90ce09 commit 1ce0373

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/spec-node/dockerCompose.ts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -703,30 +703,26 @@ export function dockerComposeCLIConfig(params: Omit<PartialExecParameters, 'cmd'
703703
let result: Promise<DockerComposeCLI>;
704704
return () => {
705705
return result || (result = (async () => {
706-
let v2 = false;
706+
let v2 = true;
707707
let stdout: Buffer;
708-
dockerCLICmd='docker-compose';
709708
try {
710709
stdout = (await dockerComposeCLI({
711710
...params,
712-
cmd: dockerComposeCLICmd,
713-
}, 'version', '--short')).stdout;
711+
cmd: dockerCLICmd,
712+
}, 'compose', 'version', '--short')).stdout;
713+
v2 = true;
714714
} catch (err) {
715-
if (err?.code !== 'ENOENT') {
716-
throw err;
717-
}
718715
stdout = (await dockerComposeCLI({
719716
...params,
720-
cmd: dockerCLICmd,
717+
cmd: dockerComposeCLICmd,
721718
}, 'version', '--short')).stdout;
722-
v2 = true;
723719
}
724720
const version = stdout.toString().trim();
725721
params.output.write(`Docker Compose version: ${version}`);
726722
return {
727723
version,
728724
cmd: v2 ? dockerCLICmd : dockerComposeCLICmd,
729-
args: v2 ? [] : ['compose'],
725+
args: v2 ? ['compose'] : [],
730726
};
731727
})());
732728
};

0 commit comments

Comments
 (0)