Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into users/alexander-smo…
Browse files Browse the repository at this point in the history
…lyakov/add_proper_handling_for_src_arg_in_mount_command
  • Loading branch information
alexander-smolyakov committed May 26, 2023
2 parents d251041 + f3ff066 commit 0a5520a
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/spec-node/dockerCompose.ts
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,11 @@ export async function readDockerComposeConfig(params: DockerCLIParameters, compo
}
try {
const partial = toExecParameters(params, 'dockerComposeCLI' in params ? await params.dockerComposeCLI() : undefined);
const { stdout } = await dockerComposeCLI({ ...partial, print: 'onerror' }, ...composeGlobalArgs, 'config');
const { stdout } = await dockerComposeCLI({
...partial,
output: makeLog(params.output, LogLevel.Info),
print: 'onerror'
}, ...composeGlobalArgs, 'config');
const stdoutStr = stdout.toString();
params.output.write(stdoutStr);
return yaml.load(stdoutStr) || {} as any;
Expand Down

0 comments on commit 0a5520a

Please sign in to comment.