use shared error helpers for Buildx and Docker commands

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax 2026-09-14 14:28:31 +02:00
parent 77ce7f4bab
commit 226a61612a
No known key found for this signature in database
GPG Key ID: ADE44D8C9D44FBE4

View File

@ -90,8 +90,8 @@ actionsToolkit.run(
ignoreReturnCode: true, ignoreReturnCode: true,
silent: true silent: true
}).then(res => { }).then(res => {
if (res.stderr.length > 0 && res.exitCode != 0) { if (res.exitCode != 0) {
core.info(`Cannot inspect default docker context: ${res.stderr.trim()}`); core.info(`Cannot inspect default docker context: ${Docker.getErrorMessage(res.stderr)}`);
} else { } else {
try { try {
const contextInfo = (<Array<ContextInfo>>JSON.parse(res.stdout.trim()))[0]; const contextInfo = (<Array<ContextInfo>>JSON.parse(res.stdout.trim()))[0];
@ -112,8 +112,8 @@ actionsToolkit.run(
await Docker.getExecOutput(['context', 'create', tmpDockerContext], { await Docker.getExecOutput(['context', 'create', tmpDockerContext], {
ignoreReturnCode: true ignoreReturnCode: true
}).then(res => { }).then(res => {
if (res.stderr.length > 0 && res.exitCode != 0) { if (res.exitCode != 0) {
core.warning(`Cannot create docker context ${tmpDockerContext}: ${res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'}`); core.warning(`Cannot create docker context ${tmpDockerContext}: ${Docker.getErrorMessage(res.stderr)}`);
} else { } else {
core.info(`Setting builder endpoint to ${tmpDockerContext} context`); core.info(`Setting builder endpoint to ${tmpDockerContext} context`);
inputs.endpoint = tmpDockerContext; inputs.endpoint = tmpDockerContext;
@ -141,8 +141,8 @@ actionsToolkit.run(
await Exec.getExecOutput(createCmd.command, createCmd.args, { await Exec.getExecOutput(createCmd.command, createCmd.args, {
ignoreReturnCode: true ignoreReturnCode: true
}).then(res => { }).then(res => {
if (res.stderr.length > 0 && res.exitCode != 0) { if (res.exitCode != 0) {
throw new Error(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'); throw new Error(`Failed to create builder ${inputs.name}: ${Buildx.getErrorMessage(res.stderr)}`);
} }
}); });
} }
@ -166,8 +166,8 @@ actionsToolkit.run(
await Exec.getExecOutput(appendCmd.command, appendCmd.args, { await Exec.getExecOutput(appendCmd.command, appendCmd.args, {
ignoreReturnCode: true ignoreReturnCode: true
}).then(res => { }).then(res => {
if (res.stderr.length > 0 && res.exitCode != 0) { if (res.exitCode != 0) {
throw new Error(`Failed to append node ${node.name}: ${res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'}`); throw new Error(`Failed to append node ${node.name}: ${Buildx.getErrorMessage(res.stderr)}`);
} }
}); });
nodeIndex++; nodeIndex++;
@ -180,8 +180,8 @@ actionsToolkit.run(
await Exec.getExecOutput(inspectCmd.command, inspectCmd.args, { await Exec.getExecOutput(inspectCmd.command, inspectCmd.args, {
ignoreReturnCode: true ignoreReturnCode: true
}).then(res => { }).then(res => {
if (res.stderr.length > 0 && res.exitCode != 0) { if (res.exitCode != 0) {
throw new Error(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'); throw new Error(`Failed to boot builder: ${Buildx.getErrorMessage(res.stderr)}`);
} }
}); });
}); });
@ -225,8 +225,8 @@ actionsToolkit.run(
await Docker.getExecOutput(['logs', `${stateHelper.containerName}`], { await Docker.getExecOutput(['logs', `${stateHelper.containerName}`], {
ignoreReturnCode: true ignoreReturnCode: true
}).then(res => { }).then(res => {
if (res.stderr.length > 0 && res.exitCode != 0) { if (res.exitCode != 0) {
core.warning(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'); core.warning(`Failed to display BuildKit logs: ${Docker.getErrorMessage(res.stderr)}`);
} }
}); });
}); });
@ -245,8 +245,8 @@ actionsToolkit.run(
await Exec.getExecOutput(rmCmd.command, rmCmd.args, { await Exec.getExecOutput(rmCmd.command, rmCmd.args, {
ignoreReturnCode: true ignoreReturnCode: true
}).then(res => { }).then(res => {
if (res.stderr.length > 0 && res.exitCode != 0) { if (res.exitCode != 0) {
core.warning(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'); core.warning(`Failed to remove builder ${stateHelper.builderName}: ${Buildx.getErrorMessage(res.stderr)}`);
} }
}); });
} else { } else {
@ -260,8 +260,8 @@ actionsToolkit.run(
await Exec.getExecOutput('docker', ['context', 'rm', '-f', stateHelper.tmpDockerContext], { await Exec.getExecOutput('docker', ['context', 'rm', '-f', stateHelper.tmpDockerContext], {
ignoreReturnCode: true ignoreReturnCode: true
}).then(res => { }).then(res => {
if (res.stderr.length > 0 && res.exitCode != 0) { if (res.exitCode != 0) {
core.warning(`${res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'}`); core.warning(`Failed to remove temp docker context ${stateHelper.tmpDockerContext}: ${Docker.getErrorMessage(res.stderr)}`);
} }
}); });
}); });