neil/setup-buildx-action
1
0
Fork 0
mirror of https://github.com/docker/setup-buildx-action.git synced 2025-10-31 19:24:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97 from crazy-max/fix-get-buildkit-version

Browse Source 
Fix `docker: invalid reference format`
This commit is contained in:
CrazyMax 2021-06-29 14:04:53 +02:00 committed by GitHub
commit a1c666d855
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
__tests__/buildx.test.ts
View File

@ -23,7 +23,7 @@ describe('getVersion', () => {
silent: true
})
.then(res => {
return !res.stdout.includes(' ') && res.exitCode == 0;
return !res.stdout.trim().includes(' ') && res.exitCode == 0;
});
}
(isDaemonRunning() ? it : it.skip)(
@ -55,7 +55,7 @@ describe('inspect', () => {
silent: true
})
.then(res => {
return !res.stdout.includes(' ') && res.exitCode == 0;
return !res.stdout.trim().includes(' ') && res.exitCode == 0;
});
}
(isDaemonRunning() ? it : it.skip)(

10
dist/index.js generated vendored
View File

@ -72,7 +72,7 @@ function getVersion() {
if (res.stderr.length > 0 && res.exitCode != 0) {
throw new Error(res.stderr.trim());
}
return parseVersion(res.stdout);
return parseVersion(res.stdout.trim());
});
});
}
@ -227,24 +227,24 @@ function getBuildKitVersion(containerID) {
.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();
});
});
}

10
src/buildx.ts
View File

@ -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();
});
}