docker/build-push-action
0
0
Fork 0
mirror of https://github.com/docker/build-push-action.git synced 2024-12-27 17:11:04 +08:00
Code Issues Projects Releases Wiki Activity

Small refactor

Browse Source 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax 2020-08-12 22:56:20 +02:00
parent ec2628bb21
commit 26b3a3b0cd
No known key found for this signature in database
GPG Key ID: 3248E46B6BB8C7F7
4 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
setup-buildx/__tests__/buildx.test.ts
View File

@ -16,6 +16,13 @@ describe('buildx', () => {
expect(countBuilders).toBeGreaterThan(0); expect(countBuilders).toBeGreaterThan(0);
}); });
it('platforms', async () => {
const platforms = await buildx.platforms();
console.log(`platforms: ${platforms}`);
expect(platforms).not.toBeUndefined();
expect(platforms).not.toEqual('');
});
it('acquires v0.2.2 version of buildx', async () => { it('acquires v0.2.2 version of buildx', async () => {
const buildxBin = await buildx.install('v0.2.2', tmpDir); const buildxBin = await buildx.install('v0.2.2', tmpDir);
console.log(buildxBin); console.log(buildxBin);

29
setup-buildx/dist/index.js generated vendored
View File

@ -2522,17 +2522,7 @@ function run() {
core.info('🐳 Docker info'); core.info('🐳 Docker info');
yield exec.exec('docker', ['info'], false); yield exec.exec('docker', ['info'], false);
core.info('🛒 Extracting available platforms...'); core.info('🛒 Extracting available platforms...');
yield exec.exec(`docker`, ['buildx', 'inspect'], true).then(res => { core.setOutput('platforms', yield buildx.platforms());
if (res.stderr != '' && !res.success) {
throw new Error(res.stderr);
}
for (const line of res.stdout.trim().split(os.EOL)) {
if (line.startsWith('Platforms')) {
core.setOutput('platforms', line.replace('Platforms: ', '').replace(/\s/g, '').trim());
break;
}
}
});
} }
catch (error) { catch (error) {
core.setFailed(error.message); core.setFailed(error.message);
@ -7239,7 +7229,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.countBuilders = exports.isAvailable = void 0; exports.install = exports.platforms = exports.countBuilders = exports.isAvailable = void 0;
const fs = __importStar(__webpack_require__(747)); const fs = __importStar(__webpack_require__(747));
const os = __importStar(__webpack_require__(87)); const os = __importStar(__webpack_require__(87));
const path = __importStar(__webpack_require__(622)); const path = __importStar(__webpack_require__(622));
@ -7272,6 +7262,21 @@ function countBuilders() {
}); });
} }
exports.countBuilders = countBuilders; exports.countBuilders = countBuilders;
function platforms() {
return __awaiter(this, void 0, void 0, function* () {
return yield exec.exec(`docker`, ['buildx', 'inspect'], true).then(res => {
if (res.stderr != '' && !res.success) {
throw new Error(res.stderr);
}
for (const line of res.stdout.trim().split(`\n`)) {
if (line.startsWith('Platforms')) {
return line.replace('Platforms: ', '').replace(/\s/g, '').trim();
}
}
});
});
}
exports.platforms = platforms;
function install(inputVersion, dockerConfigHome) { function install(inputVersion, dockerConfigHome) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const release = yield github.getRelease(inputVersion); const release = yield github.getRelease(inputVersion);

13
setup-buildx/src/buildx.ts
View File

@ -28,6 +28,19 @@ export async function countBuilders(): Promise<number> {
}); });
} }
export async function platforms(): Promise<String | undefined> {
return await exec.exec(`docker`, ['buildx', 'inspect'], true).then(res => {
if (res.stderr != '' && !res.success) {
throw new Error(res.stderr);
}
for (const line of res.stdout.trim().split(`\n`)) {
if (line.startsWith('Platforms')) {
return line.replace('Platforms: ', '').replace(/\s/g, '').trim();
}
}
});
}
export async function install(inputVersion: string, dockerConfigHome: string): Promise<string> { export async function install(inputVersion: string, dockerConfigHome: string): Promise<string> {
const release: github.GitHubRelease | null = await github.getRelease(inputVersion); const release: github.GitHubRelease | null = await github.getRelease(inputVersion);
if (!release) { if (!release) {

15
setup-buildx/src/main.ts
View File

@ -50,21 +50,8 @@ async function run(): Promise<void> {
await exec.exec('docker', ['buildx', 'install'], false); await exec.exec('docker', ['buildx', 'install'], false);
} }
core.info('🐳 Docker info');
await exec.exec('docker', ['info'], false);
core.info('🛒 Extracting available platforms...'); core.info('🛒 Extracting available platforms...');
await exec.exec(`docker`, ['buildx', 'inspect'], true).then(res => { core.setOutput('platforms', await buildx.platforms());
if (res.stderr != '' && !res.success) {
throw new Error(res.stderr);
}
for (const line of res.stdout.trim().split(os.EOL)) {
if (line.startsWith('Platforms')) {
core.setOutput('platforms', line.replace('Platforms: ', '').replace(/\s/g, '').trim());
break;
}
}
});
} catch (error) { } catch (error) {
core.setFailed(error.message); core.setFailed(error.message);
} }