huoxue1
/
setup-buildx-action
mirror of https://mirror.ghproxy.com/https://github.com/docker/setup-buildx-action.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27 from crazy-max/hotfix 

Temporarly set buildkit container image to moby/buildkit:v0.8-beta
This commit is contained in:
CrazyMax 2020-10-05 20:24:07 +02:00 committed by GitHub
parent c631d8cb6c d4577a64b2
commit 044aaa9258
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dist/index.js generated vendored
View File

@ -525,11 +525,21 @@ function run() {
if (inputs.driver !== 'docker') { if (inputs.driver !== 'docker') {
core.info('🔨 Creating a new builder instance...'); core.info('🔨 Creating a new builder instance...');
let createArgs = ['buildx', 'create', '--name', builderName, '--driver', inputs.driver]; let createArgs = ['buildx', 'create', '--name', builderName, '--driver', inputs.driver];
yield context.asyncForEach(inputs.driverOpts, (driverOpt) => __awaiter(this, void 0, void 0, function* () { if (semver.satisfies(buildxVersion, '>=0.3.0')) {
createArgs.push('--driver-opt', driverOpt); let hasImageDriverOpt = false;
})); yield context.asyncForEach(inputs.driverOpts, (driverOpt) => __awaiter(this, void 0, void 0, function* () {
if (inputs.buildkitdFlags && semver.satisfies(buildxVersion, '>=0.3.0')) { if (driverOpt.startsWith('image=')) {
createArgs.push('--buildkitd-flags', inputs.buildkitdFlags); hasImageDriverOpt = true;
}
createArgs.push('--driver-opt', driverOpt);
}));
if (!hasImageDriverOpt) {
//FIXME: Temporary fix (docker/build-push-action#154, docker/build-push-action#162)
createArgs.push('--driver-opt', 'image=moby/buildkit:v0.8-beta');
}
if (inputs.buildkitdFlags) {
createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
}
} }
if (inputs.use) { if (inputs.use) {
createArgs.push('--use'); createArgs.push('--use');

20
src/main.ts
View File

@ -33,11 +33,21 @@ async function run(): Promise<void> {
if (inputs.driver !== 'docker') { if (inputs.driver !== 'docker') {
core.info('🔨 Creating a new builder instance...'); core.info('🔨 Creating a new builder instance...');
let createArgs: Array<string> = ['buildx', 'create', '--name', builderName, '--driver', inputs.driver]; let createArgs: Array<string> = ['buildx', 'create', '--name', builderName, '--driver', inputs.driver];
await context.asyncForEach(inputs.driverOpts, async driverOpt => { if (semver.satisfies(buildxVersion, '>=0.3.0')) {
createArgs.push('--driver-opt', driverOpt); let hasImageDriverOpt: boolean = false;
}); await context.asyncForEach(inputs.driverOpts, async driverOpt => {
if (inputs.buildkitdFlags && semver.satisfies(buildxVersion, '>=0.3.0')) { if (driverOpt.startsWith('image=')) {
createArgs.push('--buildkitd-flags', inputs.buildkitdFlags); hasImageDriverOpt = true;
}
createArgs.push('--driver-opt', driverOpt);
});
if (!hasImageDriverOpt) {
//FIXME: Temporary fix (docker/build-push-action#154, docker/build-push-action#162)
createArgs.push('--driver-opt', 'image=moby/buildkit:v0.8-beta');
}
if (inputs.buildkitdFlags) {
createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
}
} }
if (inputs.use) { if (inputs.use) {
createArgs.push('--use'); createArgs.push('--use');