docker/actions-toolkit
1
0
Fork 0
mirror of https://github.com/docker/actions-toolkit.git synced 2024-11-23 11:36:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

buildx(history): improve child process termination and exit code handling

Browse Source 
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax 2024-06-29 17:42:31 +02:00
parent 200e43c426
commit ff35e30b01
No known key found for this signature in database
GPG Key ID: ADE44D8C9D44FBE4
1 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/buildx/history.ts
View File

@ -14,10 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
import {spawn} from 'child_process'; import {ChildProcessByStdio, spawn} from 'child_process';
import fs from 'fs'; import fs from 'fs';
import os from 'os'; import os from 'os';
import path from 'path'; import path from 'path';
import {Readable, Writable} from 'stream';
import * as core from '@actions/core'; import * as core from '@actions/core';
import {Buildx} from './buildx'; import {Buildx} from './buildx';
@ -91,22 +92,29 @@ export class History {
}); });
await Exec.exec('mkfifo', [buildxOutFifoPath]); await Exec.exec('mkfifo', [buildxOutFifoPath]);
const buildxCmd = await this.buildx.getCommand(['--builder', builderName, 'dial-stdio']); const buildxDialStdioCmd = await this.buildx.getCommand(['--builder', builderName, 'dial-stdio']);
core.info(`[command]${buildxDialStdioCmd.command} ${buildxDialStdioCmd.args.join(' ')}`);
core.info(`[command]${buildxCmd.command} ${buildxCmd.args.join(' ')}`); const buildxDialStdioProc = spawn(buildxDialStdioCmd.command, buildxDialStdioCmd.args, {
const buildxDialStdioProc = spawn(buildxCmd.command, buildxCmd.args, {
stdio: ['pipe', 'pipe', 'inherit'], stdio: ['pipe', 'pipe', 'inherit'],
detached: true detached: true
}); });
let buildxDialStdioKilled = false;
fs.createReadStream(buildxInFifoPath).pipe(buildxDialStdioProc.stdin); fs.createReadStream(buildxInFifoPath).pipe(buildxDialStdioProc.stdin);
buildxDialStdioProc.stdout.pipe(fs.createWriteStream(buildxOutFifoPath)); buildxDialStdioProc.stdout.pipe(fs.createWriteStream(buildxOutFifoPath));
buildxDialStdioProc.on('exit', code => { buildxDialStdioProc.on('exit', (code, signal) => {
buildxDialStdioKilled = true;
if (signal) {
core.info(`Process "buildx dial-stdio" was killed with signal ${signal}`);
} else {
core.info(`Process "buildx dial-stdio" exited with code ${code}`); core.info(`Process "buildx dial-stdio" exited with code ${code}`);
}
}); });
const tmpDockerbuildFilename = path.join(outDir, 'rec.dockerbuild'); const tmpDockerbuildFilename = path.join(outDir, 'rec.dockerbuild');
const summaryFilename = path.join(outDir, 'summary.json'); const summaryFilename = path.join(outDir, 'summary.json');
let dockerRunProc: ChildProcessByStdio<Writable, Readable, null> | undefined;
let dockerRunProcKilled = false;
await new Promise<void>((resolve, reject) => { await new Promise<void>((resolve, reject) => {
const ebargs: Array<string> = ['--ref-state-dir=/buildx-refs', `--node=${builderName}/${nodeName}`]; const ebargs: Array<string> = ['--ref-state-dir=/buildx-refs', `--node=${builderName}/${nodeName}`];
for (const ref of refs) { for (const ref of refs) {
@ -127,7 +135,7 @@ export class History {
...ebargs ...ebargs
] ]
core.info(`[command]docker ${dockerRunArgs.join(' ')}`); core.info(`[command]docker ${dockerRunArgs.join(' ')}`);
const dockerRunProc = spawn('docker', dockerRunArgs, { dockerRunProc = spawn('docker', dockerRunArgs, {
stdio: ['pipe', 'pipe', 'inherit'] stdio: ['pipe', 'pipe', 'inherit']
}); });
fs.createReadStream(buildxOutFifoPath).pipe(dockerRunProc.stdin); fs.createReadStream(buildxOutFifoPath).pipe(dockerRunProc.stdin);
@ -140,18 +148,34 @@ export class History {
resolve(); resolve();
} }
} else { } else {
reject(new Error(`Process "docker run" exited with code ${code}`)); reject(new Error(`Process "docker run" closed with code ${code}`));
} }
}); });
dockerRunProc.on('error', err => { dockerRunProc.on('error', err => {
core.error(`Error executing "docker run": ${err}`); core.error(`Error executing "docker run": ${err}`);
reject(err); reject(err);
}); });
dockerRunProc.on('exit', code => { dockerRunProc.on('exit', (code, signal) => {
dockerRunProcKilled = true;
if (signal) {
core.info(`Process "docker run" was killed with signal ${signal}`);
} else {
core.info(`Process "docker run" exited with code ${code}`); core.info(`Process "docker run" exited with code ${code}`);
}
}); });
}).catch(err => { })
.catch(err => {
throw err; throw err;
})
.finally(() => {
if (buildxDialStdioProc && !buildxDialStdioKilled) {
core.debug('Force terminating "buildx dial-stdio" process');
buildxDialStdioProc.kill('SIGKILL');
}
if (dockerRunProc && !dockerRunProcKilled) {
core.debug('Force terminating "docker run" process');
dockerRunProc.kill('SIGKILL');
}
}); });
let dockerbuildFilename = `${GitHub.context.repo.owner}~${GitHub.context.repo.repo}~${refs[0].substring(0, 6).toUpperCase()}`; let dockerbuildFilename = `${GitHub.context.repo.owner}~${GitHub.context.repo.repo}~${refs[0].substring(0, 6).toUpperCase()}`;