From cf9301c70422a10308bc53357a8d412a577899b7 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Thu, 3 Sep 2020 11:49:39 +0200
Subject: [PATCH] Use --builder

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
---
 dist/index.js  | 19 ++++---------------
 src/buildx.ts  |  8 --------
 src/context.ts |  3 +++
 src/main.ts    |  4 ----
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 786ce95..1684221 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2395,10 +2395,6 @@ function run() {
             const buildxVersion = yield buildx.getVersion();
             core.info(`📣 Buildx version: ${buildxVersion}`);
             let inputs = yield context.getInputs();
-            if (inputs.builder) {
-                core.info(`📌 Using builder instance ${inputs.builder}`);
-                yield buildx.use(inputs.builder);
-            }
             core.info(`🏃 Starting build...`);
             const args = yield context.getArgs(inputs, buildxVersion);
             yield exec.exec('docker', args);
@@ -5186,7 +5182,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.use = exports.parseVersion = exports.getVersion = exports.isAvailable = exports.getSecret = exports.getImageID = exports.getImageIDFile = void 0;
+exports.parseVersion = exports.getVersion = exports.isAvailable = exports.getSecret = exports.getImageID = exports.getImageIDFile = void 0;
 const fs_1 = __importDefault(__webpack_require__(747));
 const path_1 = __importDefault(__webpack_require__(622));
 const tmp_1 = __importDefault(__webpack_require__(517));
@@ -5252,16 +5248,6 @@ function parseVersion(stdout) {
     });
 }
 exports.parseVersion = parseVersion;
-function use(builder) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield exec.exec(`docker`, ['buildx', 'use', '--builder', builder], false).then(res => {
-            if (res.stderr != '' && !res.success) {
-                throw new Error(res.stderr);
-            }
-        });
-    });
-}
-exports.use = use;
 //# sourceMappingURL=buildx.js.map
 
 /***/ }),
@@ -13737,6 +13723,9 @@ function getCommonArgs(inputs) {
         if (inputs.noCache) {
             args.push('--no-cache');
         }
+        if (inputs.builder) {
+            args.push('--builder', inputs.builder);
+        }
         if (inputs.pull) {
             args.push('--pull');
         }
diff --git a/src/buildx.ts b/src/buildx.ts
index 30bfb03..34da1c0 100644
--- a/src/buildx.ts
+++ b/src/buildx.ts
@@ -51,11 +51,3 @@ export async function parseVersion(stdout: string): Promise<string> {
   }
   return semver.clean(matches[1]);
 }
-
-export async function use(builder: string): Promise<void> {
-  return await exec.exec(`docker`, ['buildx', 'use', '--builder', builder], false).then(res => {
-    if (res.stderr != '' && !res.success) {
-      throw new Error(res.stderr);
-    }
-  });
-}
diff --git a/src/context.ts b/src/context.ts
index 8c4b4bf..a2e1a14 100644
--- a/src/context.ts
+++ b/src/context.ts
@@ -106,6 +106,9 @@ async function getCommonArgs(inputs: Inputs): Promise<Array<string>> {
   if (inputs.noCache) {
     args.push('--no-cache');
   }
+  if (inputs.builder) {
+    args.push('--builder', inputs.builder);
+  }
   if (inputs.pull) {
     args.push('--pull');
   }
diff --git a/src/main.ts b/src/main.ts
index 503b5e5..0b51543 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -23,10 +23,6 @@ async function run(): Promise<void> {
     core.info(`📣 Buildx version: ${buildxVersion}`);
 
     let inputs: context.Inputs = await context.getInputs();
-    if (inputs.builder) {
-      core.info(`📌 Using builder instance ${inputs.builder}`);
-      await buildx.use(inputs.builder);
-    }
 
     core.info(`🏃 Starting build...`);
     const args: string[] = await context.getArgs(inputs, buildxVersion);