Merge pull request #72 from crazy-max/buildkit-version

Display BuildKit version
This commit is contained in:
CrazyMax 2021-04-28 22:06:10 +02:00 committed by GitHub
commit 0d135e0c2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 59 additions and 11 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -243,6 +243,8 @@ jobs:
uses: ./ uses: ./
with: with:
endpoint: mycontext endpoint: mycontext
env:
DOCKER_CONTEXT: mycontext
config: config:
runs-on: ubuntu-latest runs-on: ubuntu-latest

37
dist/index.js generated vendored
View File

@ -584,6 +584,9 @@ function run() {
core.endGroup(); core.endGroup();
if (inputs.driver == 'docker-container') { if (inputs.driver == 'docker-container') {
stateHelper.setContainerName(`buildx_buildkit_${builder.node_name}`); stateHelper.setContainerName(`buildx_buildkit_${builder.node_name}`);
core.startGroup(`BuildKit version`);
core.info(yield buildx.getBuildKitVersion(`buildx_buildkit_${builder.node_name}`));
core.endGroup();
} }
if (core.isDebug() || ((_a = builder.node_flags) === null || _a === void 0 ? void 0 : _a.includes('--debug'))) { if (core.isDebug() || ((_a = builder.node_flags) === null || _a === void 0 ? void 0 : _a.includes('--debug'))) {
stateHelper.setDebug('true'); stateHelper.setDebug('true');
@ -599,7 +602,7 @@ function cleanup() {
if (stateHelper.IsDebug && stateHelper.containerName.length > 0) { if (stateHelper.IsDebug && stateHelper.containerName.length > 0) {
core.startGroup(`BuildKit container logs`); core.startGroup(`BuildKit container logs`);
yield mexec.exec('docker', ['logs', `${stateHelper.containerName}`], false).then(res => { yield mexec.exec('docker', ['logs', `${stateHelper.containerName}`], false).then(res => {
if (res.stderr != '' && !res.success) { if (res.stderr.length > 0 && !res.success) {
core.warning(res.stderr); core.warning(res.stderr);
} }
}); });
@ -608,7 +611,7 @@ function cleanup() {
if (stateHelper.builderName.length > 0) { if (stateHelper.builderName.length > 0) {
core.startGroup(`Removing builder`); core.startGroup(`Removing builder`);
yield mexec.exec('docker', ['buildx', 'rm', `${stateHelper.builderName}`], false).then(res => { yield mexec.exec('docker', ['buildx', 'rm', `${stateHelper.builderName}`], false).then(res => {
if (res.stderr != '' && !res.success) { if (res.stderr.length > 0 && !res.success) {
core.warning(res.stderr); core.warning(res.stderr);
} }
}); });
@ -2147,7 +2150,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
}); });
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.install = exports.inspect = exports.isAvailable = exports.parseVersion = exports.getVersion = void 0; exports.getBuildKitVersion = exports.install = exports.inspect = exports.isAvailable = exports.parseVersion = exports.getVersion = void 0;
const fs = __importStar(__webpack_require__(747)); const fs = __importStar(__webpack_require__(747));
const path = __importStar(__webpack_require__(622)); const path = __importStar(__webpack_require__(622));
const semver = __importStar(__webpack_require__(383)); const semver = __importStar(__webpack_require__(383));
@ -2160,7 +2163,7 @@ const tc = __importStar(__webpack_require__(784));
function getVersion() { function getVersion() {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
return yield exec.exec(`docker`, ['buildx', 'version'], true).then(res => { return yield exec.exec(`docker`, ['buildx', 'version'], true).then(res => {
if (res.stderr != '' && !res.success) { if (res.stderr.length > 0 && !res.success) {
throw new Error(res.stderr); throw new Error(res.stderr);
} }
return parseVersion(res.stdout); return parseVersion(res.stdout);
@ -2181,7 +2184,7 @@ exports.parseVersion = parseVersion;
function isAvailable() { function isAvailable() {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
return yield exec.exec(`docker`, ['buildx'], true).then(res => { return yield exec.exec(`docker`, ['buildx'], true).then(res => {
if (res.stderr != '' && !res.success) { if (res.stderr.length > 0 && !res.success) {
return false; return false;
} }
return res.success; return res.success;
@ -2192,7 +2195,7 @@ exports.isAvailable = isAvailable;
function inspect(name) { function inspect(name) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
return yield exec.exec(`docker`, ['buildx', 'inspect', name], true).then(res => { return yield exec.exec(`docker`, ['buildx', 'inspect', name], true).then(res => {
if (res.stderr != '' && !res.success) { if (res.stderr.length > 0 && !res.success) {
throw new Error(res.stderr); throw new Error(res.stderr);
} }
const builder = {}; const builder = {};
@ -2314,6 +2317,28 @@ function filename(version) {
return util.format('buildx-v%s.%s-%s%s', version, platform, arch, ext); return util.format('buildx-v%s.%s-%s%s', version, platform, arch, ext);
}); });
} }
function getBuildKitVersion(containerID) {
return __awaiter(this, void 0, void 0, function* () {
return exec.exec(`docker`, ['inspect', '--format', '{{.Config.Image}}', containerID], true).then(bkitimage => {
if (bkitimage.success && bkitimage.stdout.length > 0) {
return exec.exec(`docker`, ['run', '--rm', bkitimage.stdout, '--version'], true).then(bkitversion => {
if (bkitversion.success && bkitversion.stdout.length > 0) {
return `${bkitimage.stdout} => ${bkitversion.stdout}`;
}
else if (bkitversion.stderr.length > 0) {
core.warning(bkitversion.stderr);
}
return bkitversion.stdout;
});
}
else if (bkitimage.stderr.length > 0) {
core.warning(bkitimage.stderr);
}
return bkitimage.stdout;
});
});
}
exports.getBuildKitVersion = getBuildKitVersion;
//# sourceMappingURL=buildx.js.map //# sourceMappingURL=buildx.js.map
/***/ }), /***/ }),

View File

@ -20,7 +20,7 @@ export type Builder = {
export async function getVersion(): Promise<string> { export async function getVersion(): Promise<string> {
return await exec.exec(`docker`, ['buildx', 'version'], true).then(res => { return await exec.exec(`docker`, ['buildx', 'version'], true).then(res => {
if (res.stderr != '' && !res.success) { if (res.stderr.length > 0 && !res.success) {
throw new Error(res.stderr); throw new Error(res.stderr);
} }
return parseVersion(res.stdout); return parseVersion(res.stdout);
@ -37,7 +37,7 @@ export async function parseVersion(stdout: string): Promise<string> {
export async function isAvailable(): Promise<Boolean> { export async function isAvailable(): Promise<Boolean> {
return await exec.exec(`docker`, ['buildx'], true).then(res => { return await exec.exec(`docker`, ['buildx'], true).then(res => {
if (res.stderr != '' && !res.success) { if (res.stderr.length > 0 && !res.success) {
return false; return false;
} }
return res.success; return res.success;
@ -46,7 +46,7 @@ export async function isAvailable(): Promise<Boolean> {
export async function inspect(name: string): Promise<Builder> { export async function inspect(name: string): Promise<Builder> {
return await exec.exec(`docker`, ['buildx', 'inspect', name], true).then(res => { return await exec.exec(`docker`, ['buildx', 'inspect', name], true).then(res => {
if (res.stderr != '' && !res.success) { if (res.stderr.length > 0 && !res.success) {
throw new Error(res.stderr); throw new Error(res.stderr);
} }
const builder: Builder = {}; const builder: Builder = {};
@ -171,3 +171,21 @@ async function filename(version: string): Promise<string> {
const ext: string = context.osPlat == 'win32' ? '.exe' : ''; const ext: string = context.osPlat == 'win32' ? '.exe' : '';
return util.format('buildx-v%s.%s-%s%s', version, platform, arch, ext); return util.format('buildx-v%s.%s-%s%s', version, platform, arch, ext);
} }
export async function getBuildKitVersion(containerID: string): Promise<string> {
return exec.exec(`docker`, ['inspect', '--format', '{{.Config.Image}}', containerID], true).then(bkitimage => {
if (bkitimage.success && bkitimage.stdout.length > 0) {
return exec.exec(`docker`, ['run', '--rm', bkitimage.stdout, '--version'], true).then(bkitversion => {
if (bkitversion.success && bkitversion.stdout.length > 0) {
return `${bkitimage.stdout} => ${bkitversion.stdout}`;
} else if (bkitversion.stderr.length > 0) {
core.warning(bkitversion.stderr);
}
return bkitversion.stdout;
});
} else if (bkitimage.stderr.length > 0) {
core.warning(bkitimage.stderr);
}
return bkitimage.stdout;
});
}

View File

@ -81,6 +81,9 @@ async function run(): Promise<void> {
if (inputs.driver == 'docker-container') { if (inputs.driver == 'docker-container') {
stateHelper.setContainerName(`buildx_buildkit_${builder.node_name}`); stateHelper.setContainerName(`buildx_buildkit_${builder.node_name}`);
core.startGroup(`BuildKit version`);
core.info(await buildx.getBuildKitVersion(`buildx_buildkit_${builder.node_name}`));
core.endGroup();
} }
if (core.isDebug() || builder.node_flags?.includes('--debug')) { if (core.isDebug() || builder.node_flags?.includes('--debug')) {
stateHelper.setDebug('true'); stateHelper.setDebug('true');
@ -94,7 +97,7 @@ async function cleanup(): Promise<void> {
if (stateHelper.IsDebug && stateHelper.containerName.length > 0) { if (stateHelper.IsDebug && stateHelper.containerName.length > 0) {
core.startGroup(`BuildKit container logs`); core.startGroup(`BuildKit container logs`);
await mexec.exec('docker', ['logs', `${stateHelper.containerName}`], false).then(res => { await mexec.exec('docker', ['logs', `${stateHelper.containerName}`], false).then(res => {
if (res.stderr != '' && !res.success) { if (res.stderr.length > 0 && !res.success) {
core.warning(res.stderr); core.warning(res.stderr);
} }
}); });
@ -104,7 +107,7 @@ async function cleanup(): Promise<void> {
if (stateHelper.builderName.length > 0) { if (stateHelper.builderName.length > 0) {
core.startGroup(`Removing builder`); core.startGroup(`Removing builder`);
await mexec.exec('docker', ['buildx', 'rm', `${stateHelper.builderName}`], false).then(res => { await mexec.exec('docker', ['buildx', 'rm', `${stateHelper.builderName}`], false).then(res => {
if (res.stderr != '' && !res.success) { if (res.stderr.length > 0 && !res.success) {
core.warning(res.stderr); core.warning(res.stderr);
} }
}); });