Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cli- docker-compose - swap of installation packages #848

Merged
merged 11 commits into from
Jun 21, 2024
Merged

cli- docker-compose - swap of installation packages #848

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9c696c5
cli- docker-compose - swap of installation packages
gauravsaini04 Jun 18, 2024
f84a285
misc change
gauravsaini04 Jun 18, 2024
bae0104
misc change
gauravsaini04 Jun 18, 2024
447dc38
misc changes
gauravsaini04 Jun 18, 2024
e952a69
change
gauravsaini04 Jun 18, 2024
e2b0459
Update devContainers.ts
gauravsaini04 Jun 18, 2024
6b24c1c
Update devContainersSpecCLI.ts
gauravsaini04 Jun 18, 2024
415768b
Update upgradeCommand.ts
gauravsaini04 Jun 18, 2024
c90ce09
change
gauravsaini04 Jun 18, 2024
1ce0373
changes as requested
gauravsaini04 Jun 21, 2024
a381a96
changes as requested
gauravsaini04 Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/spec-node/dockerCompose.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,22 +703,19 @@ 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;
try {
stdout = (await dockerComposeCLI({
...params,
cmd: dockerComposeCLICmd,
}, 'version', '--short')).stdout;
cmd: dockerCLICmd,
}, 'compose', 'version', '--short')).stdout;
} catch (err) {
if (err?.code !== 'ENOENT') {
throw err;
}
stdout = (await dockerComposeCLI({
...params,
cmd: dockerCLICmd,
}, 'compose', 'version', '--short')).stdout;
v2 = true;
cmd: dockerComposeCLICmd,
}, 'version', '--short')).stdout;
v2 = false;
}
const version = stdout.toString().trim();
params.output.write(`Docker Compose version: ${version}`);
Expand Down