Skip to content

Commit 044aaa9

Browse files
authored
Merge pull request #27 from crazy-max/hotfix
Temporarly set buildkit container image to moby/buildkit:v0.8-beta
2 parents c631d8c + d4577a6 commit 044aaa9

File tree

2 files changed

+30
-10
lines changed

2 files changed

+30
-10
lines changed

dist/index.js

+15-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main.ts

+15-5
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,21 @@ async function run(): Promise<void> {
3333
if (inputs.driver !== 'docker') {
3434
core.info('🔨 Creating a new builder instance...');
3535
let createArgs: Array<string> = ['buildx', 'create', '--name', builderName, '--driver', inputs.driver];
36-
await context.asyncForEach(inputs.driverOpts, async driverOpt => {
37-
createArgs.push('--driver-opt', driverOpt);
38-
});
39-
if (inputs.buildkitdFlags && semver.satisfies(buildxVersion, '>=0.3.0')) {
40-
createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
36+
if (semver.satisfies(buildxVersion, '>=0.3.0')) {
37+
let hasImageDriverOpt: boolean = false;
38+
await context.asyncForEach(inputs.driverOpts, async driverOpt => {
39+
if (driverOpt.startsWith('image=')) {
40+
hasImageDriverOpt = true;
41+
}
42+
createArgs.push('--driver-opt', driverOpt);
43+
});
44+
if (!hasImageDriverOpt) {
45+
//FIXME: Temporary fix (docker/build-push-action#154, docker/build-push-action#162)
46+
createArgs.push('--driver-opt', 'image=moby/buildkit:v0.8-beta');
47+
}
48+
if (inputs.buildkitdFlags) {
49+
createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
50+
}
4151
}
4252
if (inputs.use) {
4353
createArgs.push('--use');

0 commit comments

Comments
 (0)