Temporarly set buildkit container image to moby/buildkit:v0.8-beta

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
docker · Oct 5, 2020 · d4577a6 · d4577a6
1 parent c631d8c
commit d4577a6
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/main.ts b/src/main.ts
@@ -33,11 +33,21 @@ async function run(): Promise<void> {
     if (inputs.driver !== 'docker') {
       core.info('🔨 Creating a new builder instance...');
       let createArgs: Array<string> = ['buildx', 'create', '--name', builderName, '--driver', inputs.driver];
-      await context.asyncForEach(inputs.driverOpts, async driverOpt => {
-        createArgs.push('--driver-opt', driverOpt);
-      });
-      if (inputs.buildkitdFlags && semver.satisfies(buildxVersion, '>=0.3.0')) {
-        createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
+      if (semver.satisfies(buildxVersion, '>=0.3.0')) {
+        let hasImageDriverOpt: boolean = false;
+        await context.asyncForEach(inputs.driverOpts, async driverOpt => {
+          if (driverOpt.startsWith('image=')) {
+            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) {
         createArgs.push('--use');