|
|
|
@ -42,7 +42,7 @@ export async function getVersion(): Promise<string> {
|
|
|
|
|
if (res.stderr.length > 0 && res.exitCode != 0) {
|
|
|
|
|
throw new Error(res.stderr.trim());
|
|
|
|
|
}
|
|
|
|
|
return parseVersion(res.stdout);
|
|
|
|
|
return parseVersion(res.stdout.trim());
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -196,21 +196,21 @@ export async function getBuildKitVersion(containerID: string): Promise<string> {
|
|
|
|
|
.then(bkitimage => {
|
|
|
|
|
if (bkitimage.exitCode == 0 && bkitimage.stdout.length > 0) {
|
|
|
|
|
return exec
|
|
|
|
|
.getExecOutput(`docker`, ['run', '--rm', bkitimage.stdout, '--version'], {
|
|
|
|
|
.getExecOutput(`docker`, ['run', '--rm', bkitimage.stdout.trim(), '--version'], {
|
|
|
|
|
ignoreReturnCode: true,
|
|
|
|
|
silent: true
|
|
|
|
|
})
|
|
|
|
|
.then(bkitversion => {
|
|
|
|
|
if (bkitversion.exitCode == 0 && bkitversion.stdout.length > 0) {
|
|
|
|
|
return `${bkitimage.stdout} => ${bkitversion.stdout}`;
|
|
|
|
|
return `${bkitimage.stdout.trim()} => ${bkitversion.stdout.trim()}`;
|
|
|
|
|
} else if (bkitversion.stderr.length > 0) {
|
|
|
|
|
core.warning(bkitversion.stderr.trim());
|
|
|
|
|
}
|
|
|
|
|
return bkitversion.stdout;
|
|
|
|
|
return bkitversion.stdout.trim();
|
|
|
|
|
});
|
|
|
|
|
} else if (bkitimage.stderr.length > 0) {
|
|
|
|
|
core.warning(bkitimage.stderr.trim());
|
|
|
|
|
}
|
|
|
|
|
return bkitimage.stdout;
|
|
|
|
|
return bkitimage.stdout.trim();
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|