daanselen/composite-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: daanselen:d9c972fcafe32dfaa4a81c4e9c9825144c63045f
Branches Tags
daanselen:main
..
compare: daanselen:main
Branches Tags
daanselen:main

7 Commits
d9c972fcaf ... main

Author SHA1 Message Date
DaanSelen
7243ea3674 Merge pull request 'Update dependency undici to v8' (#4) from renovate/undici-8.x into main 
Reviewed-on: #4
 2026-04-03 11:28:53 +00:00
Renovate Bot
62c5b5d727 Update dependency undici to v8 2026-04-03 11:26:35 +00:00
Daan Selen
b0960e8b14 Merge pull request 'Update dependency undici to v7' (#3) from renovate/undici-7.x into main 
Reviewed-on: #3
Reviewed-by: Daan Selen <dselen@systemec.nl>
 2025-09-15 15:54:58 +00:00
Renovate Bot
954a55271a Update dependency undici to v7 2025-09-15 15:47:15 +00:00
Daan Selen
265328e917 Merge pull request 'Configure Renovate' (#2) from renovate/configure into main 
Reviewed-on: #2
 2025-09-15 15:46:18 +00:00
Renovate Bot
ec9386f924 Add renovate.json 2025-09-15 15:29:39 +00:00
Daan Selen
6e7555e536 Code update 2025-08-09 00:33:26 +02:00
4 changed files with 18 additions and 7 deletions
Expand all files Collapse all files

10
docker-scout/dist/index.js vendored
View File

@@ -27617,15 +27617,19 @@ async function runScoutCommand(commands, image, format, outputFile) {
core.setOutput('result-file', resultPath); core.setOutput('result-file', resultPath);
for (const cmd of commands) { for (const cmd of commands) {
const args = ['scout', cmd, image];
if (cmd == 'cves') {
args.push('--format', format);
}
if (outputFile) { if (outputFile) {
const res = await exec.getExecOutput('docker', ['scout', cmd, image, '--format', format], { silent: true }); const res = await exec.getExecOutput('docker', args, { silent: true });
if (res.stderr && res.stderr.length > 0) { if (res.stderr && res.stderr.length > 0) {
throw new Error(res.stderr); throw new Error(res.stderr);
} }
fs.appendFile(resultPath, res.stdout); fs.appendFile(resultPath, res.stdout);
} else { } else {
await exec.exec('docker', ['scout', cmd, image, '--format', format]); await exec.exec('docker', args);
} }
} }
return resultPath; return resultPath;

2
docker-scout/package.json
View File

@@ -5,7 +5,7 @@
"main": "index.js", "main": "index.js",
"dependencies": { "dependencies": {
"tunnel": "^0.0.6", "tunnel": "^0.0.6",
"undici": "^5.29.0" "undici": "^8.0.0"
}, },
"devDependencies": {}, "devDependencies": {},
"scripts": { "scripts": {

10
docker-scout/src/index.js
View File

@@ -60,15 +60,19 @@ async function runScoutCommand(commands, image, format, outputFile) {
core.setOutput('result-file', resultPath); core.setOutput('result-file', resultPath);
for (const cmd of commands) { for (const cmd of commands) {
const args = ['scout', cmd, image];
if (cmd == 'cves') {
args.push('--format', format);
}
if (outputFile) { if (outputFile) {
const res = await exec.getExecOutput('docker', ['scout', cmd, image, '--format', format], { silent: true }); const res = await exec.getExecOutput('docker', args, { silent: true });
if (res.stderr && res.stderr.length > 0) { if (res.stderr && res.stderr.length > 0) {
throw new Error(res.stderr); throw new Error(res.stderr);
} }
fs.appendFile(resultPath, res.stdout); fs.appendFile(resultPath, res.stdout);
} else { } else {
await exec.exec('docker', ['scout', cmd, image, '--format', format]); await exec.exec('docker', args);
} }
} }
return resultPath; return resultPath;

3
renovate.json Normal file
View File

@@ -0,0 +1,3 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json"
}