mirror of
https://github.com/docker/setup-buildx-action
synced 2024-11-10 06:01:40 +00:00
Fix docker: invalid reference format
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
parent
2e941f2def
commit
d5b70f51d8
3 changed files with 12 additions and 12 deletions
|
@ -23,7 +23,7 @@ describe('getVersion', () => {
|
||||||
silent: true
|
silent: true
|
||||||
})
|
})
|
||||||
.then(res => {
|
.then(res => {
|
||||||
return !res.stdout.includes(' ') && res.exitCode == 0;
|
return !res.stdout.trim().includes(' ') && res.exitCode == 0;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
(isDaemonRunning() ? it : it.skip)(
|
(isDaemonRunning() ? it : it.skip)(
|
||||||
|
@ -55,7 +55,7 @@ describe('inspect', () => {
|
||||||
silent: true
|
silent: true
|
||||||
})
|
})
|
||||||
.then(res => {
|
.then(res => {
|
||||||
return !res.stdout.includes(' ') && res.exitCode == 0;
|
return !res.stdout.trim().includes(' ') && res.exitCode == 0;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
(isDaemonRunning() ? it : it.skip)(
|
(isDaemonRunning() ? it : it.skip)(
|
||||||
|
|
10
dist/index.js
generated
vendored
10
dist/index.js
generated
vendored
|
@ -72,7 +72,7 @@ function getVersion() {
|
||||||
if (res.stderr.length > 0 && res.exitCode != 0) {
|
if (res.stderr.length > 0 && res.exitCode != 0) {
|
||||||
throw new Error(res.stderr.trim());
|
throw new Error(res.stderr.trim());
|
||||||
}
|
}
|
||||||
return parseVersion(res.stdout);
|
return parseVersion(res.stdout.trim());
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -227,24 +227,24 @@ function getBuildKitVersion(containerID) {
|
||||||
.then(bkitimage => {
|
.then(bkitimage => {
|
||||||
if (bkitimage.exitCode == 0 && bkitimage.stdout.length > 0) {
|
if (bkitimage.exitCode == 0 && bkitimage.stdout.length > 0) {
|
||||||
return exec
|
return exec
|
||||||
.getExecOutput(`docker`, ['run', '--rm', bkitimage.stdout, '--version'], {
|
.getExecOutput(`docker`, ['run', '--rm', bkitimage.stdout.trim(), '--version'], {
|
||||||
ignoreReturnCode: true,
|
ignoreReturnCode: true,
|
||||||
silent: true
|
silent: true
|
||||||
})
|
})
|
||||||
.then(bkitversion => {
|
.then(bkitversion => {
|
||||||
if (bkitversion.exitCode == 0 && bkitversion.stdout.length > 0) {
|
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) {
|
else if (bkitversion.stderr.length > 0) {
|
||||||
core.warning(bkitversion.stderr.trim());
|
core.warning(bkitversion.stderr.trim());
|
||||||
}
|
}
|
||||||
return bkitversion.stdout;
|
return bkitversion.stdout.trim();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
else if (bkitimage.stderr.length > 0) {
|
else if (bkitimage.stderr.length > 0) {
|
||||||
core.warning(bkitimage.stderr.trim());
|
core.warning(bkitimage.stderr.trim());
|
||||||
}
|
}
|
||||||
return bkitimage.stdout;
|
return bkitimage.stdout.trim();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,7 +42,7 @@ export async function getVersion(): Promise<string> {
|
||||||
if (res.stderr.length > 0 && res.exitCode != 0) {
|
if (res.stderr.length > 0 && res.exitCode != 0) {
|
||||||
throw new Error(res.stderr.trim());
|
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 => {
|
.then(bkitimage => {
|
||||||
if (bkitimage.exitCode == 0 && bkitimage.stdout.length > 0) {
|
if (bkitimage.exitCode == 0 && bkitimage.stdout.length > 0) {
|
||||||
return exec
|
return exec
|
||||||
.getExecOutput(`docker`, ['run', '--rm', bkitimage.stdout, '--version'], {
|
.getExecOutput(`docker`, ['run', '--rm', bkitimage.stdout.trim(), '--version'], {
|
||||||
ignoreReturnCode: true,
|
ignoreReturnCode: true,
|
||||||
silent: true
|
silent: true
|
||||||
})
|
})
|
||||||
.then(bkitversion => {
|
.then(bkitversion => {
|
||||||
if (bkitversion.exitCode == 0 && bkitversion.stdout.length > 0) {
|
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) {
|
} else if (bkitversion.stderr.length > 0) {
|
||||||
core.warning(bkitversion.stderr.trim());
|
core.warning(bkitversion.stderr.trim());
|
||||||
}
|
}
|
||||||
return bkitversion.stdout;
|
return bkitversion.stdout.trim();
|
||||||
});
|
});
|
||||||
} else if (bkitimage.stderr.length > 0) {
|
} else if (bkitimage.stderr.length > 0) {
|
||||||
core.warning(bkitimage.stderr.trim());
|
core.warning(bkitimage.stderr.trim());
|
||||||
}
|
}
|
||||||
return bkitimage.stdout;
|
return bkitimage.stdout.trim();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue