Compare commits

..

2 Commits

Author SHA1 Message Date
Simar
41f05d9ecf Revert "Include args when using trivy config file (#231)"
Fixes: https://github.com/aquasecurity/trivy-action/issues/238

This reverts commit 82ec0dd604.
2023-06-09 16:37:19 -06:00
Daniel Chabr
0cd397afbf bump trivy to v0.42.1 (#240)
* bump trivy to v0.42.1

* revert formatting
2023-06-09 12:01:09 -06:00
7 changed files with 5 additions and 16 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
name: "build"
on: [push, pull_request]
env:
TRIVY_VERSION: 0.42.0
TRIVY_VERSION: 0.42.1
BATS_LIB_PATH: '/usr/lib/'
jobs:
build:
+1 -1
View File
@@ -1,4 +1,4 @@
FROM ghcr.io/aquasecurity/trivy:0.42.0
FROM ghcr.io/aquasecurity/trivy:0.42.1
COPY entrypoint.sh /
RUN apk --no-cache add bash curl npm
RUN chmod +x /entrypoint.sh
+1 -1
View File
@@ -180,7 +180,7 @@ if [ "${format}" == "sarif" ] && [ "${limitSeveritiesForSARIF}" != "true" ]; the
trivy --quiet ${scanType} --format sarif --output ${output} $SARIF_ARGS ${artifactRef}
elif [ $trivyConfig ]; then
echo "Running Trivy with trivy.yaml config from: " $trivyConfig
trivy --config $trivyConfig ${ARGS} ${scanType} ${artifactRef}
trivy --config $trivyConfig ${scanType} ${artifactRef}
returnCode=$?
else
echo "Running trivy with options: trivy ${scanType} ${ARGS}" "${artifactRef}"
+1 -1
View File
@@ -64,7 +64,7 @@
}
}
],
"version": "0.42.0"
"version": "0.42.1"
}
},
"results": [
+1 -1
View File
@@ -37,7 +37,7 @@
}
}
],
"version": "0.42.0"
"version": "0.42.1"
}
},
"results": [
-3
View File
@@ -1,3 +0,0 @@
vulnerability:
type: os
output: yamlconfig.test
-8
View File
@@ -81,11 +81,3 @@ bats_load_library bats-file
echo "$output"
assert_files_equal yamlconfig.test ./test/data/yamlconfig.test
}
@test "trivy image with trivy.yaml config and args" {
# trivy --config=./test/data/trivy-reduced.yaml image alpine:3.10
run ./entrypoint.sh "-v ./test/data/trivy-reduced.yaml" "-a image" "-i alpine:3.10" "-b json" "-g CRITICAL"
run diff yamlconfig.test ./test/data/yamlconfig.test
echo "$output"
assert_files_equal yamlconfig.test ./test/data/yamlconfig.test
}