Merge pull request #43 from crazy-max/remove-tempfix

Remove hardcoded buildkit container image moby/buildkit:v0.8-beta
docker · Dec 6, 2020 · 5c0276a · 5c0276a
2 parents c3c3e01 + ca778fe
commit 5c0276a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 16 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/main.ts b/src/main.ts
@@ -36,17 +36,9 @@ async function run(): Promise<void> {
       core.startGroup(`🔨 Creating a new builder instance`);
       let createArgs: Array<string> = ['buildx', 'create', '--name', builderName, '--driver', inputs.driver];
       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);
         }