@@ -33,11 +33,21 @@ async function run(): Promise<void> {
33
33
if ( inputs . driver !== 'docker' ) {
34
34
core . info ( '🔨 Creating a new builder instance...' ) ;
35
35
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
+ }
41
51
}
42
52
if ( inputs . use ) {
43
53
createArgs . push ( '--use' ) ;
0 commit comments