From 200e43c426bade3ab229c11b92365d783c8b80e7 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Sat, 29 Jun 2024 15:04:30 +0200
Subject: [PATCH] buildx(history): detach dial-stdio process

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
---
 src/buildx/history.ts | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/buildx/history.ts b/src/buildx/history.ts
index 31a4448..a8c1b6e 100644
--- a/src/buildx/history.ts
+++ b/src/buildx/history.ts
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-import {ChildProcessByStdio, spawn} from 'child_process';
+import {spawn} from 'child_process';
 import fs from 'fs';
-import {Readable, Writable} from 'node:stream';
 import os from 'os';
 import path from 'path';
 import * as core from '@actions/core';
@@ -93,9 +92,17 @@ export class History {
     await Exec.exec('mkfifo', [buildxOutFifoPath]);
 
     const buildxCmd = await this.buildx.getCommand(['--builder', builderName, 'dial-stdio']);
-    const buildxDialStdioProc = History.spawn(buildxCmd.command, buildxCmd.args);
+
+    core.info(`[command]${buildxCmd.command} ${buildxCmd.args.join(' ')}`);
+    const buildxDialStdioProc = spawn(buildxCmd.command, buildxCmd.args, {
+      stdio: ['pipe', 'pipe', 'inherit'],
+      detached: true
+    });
     fs.createReadStream(buildxInFifoPath).pipe(buildxDialStdioProc.stdin);
     buildxDialStdioProc.stdout.pipe(fs.createWriteStream(buildxOutFifoPath));
+    buildxDialStdioProc.on('exit', code => {
+      core.info(`Process "buildx dial-stdio" exited with code ${code}`);
+    });
 
     const tmpDockerbuildFilename = path.join(outDir, 'rec.dockerbuild');
     const summaryFilename = path.join(outDir, 'summary.json');
@@ -112,13 +119,17 @@ export class History {
         ebargs.push(`--gid=${process.getgid()}`);
       }
       // prettier-ignore
-      const dockerRunProc = History.spawn('docker', [
+      const dockerRunArgs = [
         'run', '--rm', '-i',
         '-v', `${Buildx.refsDir}:/buildx-refs`,
         '-v', `${outDir}:/out`,
         opts.image || History.EXPORT_TOOL_IMAGE,
         ...ebargs
-      ]);
+      ]
+      core.info(`[command]docker ${dockerRunArgs.join(' ')}`);
+      const dockerRunProc = spawn('docker', dockerRunArgs, {
+        stdio: ['pipe', 'pipe', 'inherit']
+      });
       fs.createReadStream(buildxOutFifoPath).pipe(dockerRunProc.stdin);
       dockerRunProc.stdout.pipe(fs.createWriteStream(buildxInFifoPath));
       dockerRunProc.on('close', code => {
@@ -133,9 +144,12 @@ export class History {
         }
       });
       dockerRunProc.on('error', err => {
-        core.error(`Error executing buildx dial-stdio: ${err}`);
+        core.error(`Error executing "docker run": ${err}`);
         reject(err);
       });
+      dockerRunProc.on('exit', code => {
+        core.info(`Process "docker run" exited with code ${code}`);
+      });
     }).catch(err => {
       throw err;
     });
@@ -162,11 +176,4 @@ export class History {
       refs: refs
     };
   }
-
-  private static spawn(command: string, args?: ReadonlyArray<string>): ChildProcessByStdio<Writable, Readable, null> {
-    core.info(`[command]${command}${args ? ` ${args.join(' ')}` : ''}`);
-    return spawn(command, args || [], {
-      stdio: ['pipe', 'pipe', 'inherit']
-    });
-  }
 }