Compare commits

..

4 Commits

Author SHA1 Message Date
Kyle Davies
2b6a709cf9 Add filesystem alias (#269) 2023-11-06 18:35:42 -07:00
Victor Sollerhed
47e481a388 Update to trivy version 0.47.0 in Dockerfile (#280)
See:
- https://github.com/aquasecurity/trivy/releases/tag/v0.47.0
2023-11-06 18:35:08 -07:00
Liam MacPherson
7b07fa7d6a fix: set return code after each Trivy call (#247)
This change moves the return code to outside the trivy call. This fixes
#228 as the return code was not being propagated.
2023-11-06 18:32:48 -07:00
Witold Ślęczkowski
f78e9ecf42 Update Dockerfile to 0.46.1 (#277)
This update fixes https://github.com/aquasecurity/trivy/issues/5441
2023-10-30 18:28:16 -06:00
2 changed files with 3 additions and 4 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
FROM ghcr.io/aquasecurity/trivy:0.46.0
FROM ghcr.io/aquasecurity/trivy:0.47.0
COPY entrypoint.sh /
RUN apk --no-cache add bash curl npm
RUN chmod +x /entrypoint.sh
+2 -3
View File
@@ -77,7 +77,7 @@ done
scanType=$(echo $scanType | tr -d '\r')
export artifactRef="${imageRef}"
if [ "${scanType}" = "repo" ] || [ "${scanType}" = "fs" ] || [ "${scanType}" = "config" ] || [ "${scanType}" = "rootfs" ];then
if [ "${scanType}" = "repo" ] || [ "${scanType}" = "fs" ] || [ "${scanType}" = "filesystem" ] || [ "${scanType}" = "config" ] || [ "${scanType}" = "rootfs" ];then
artifactRef=$(echo $scanRef | tr -d '\r')
fi
input=$(echo $input | tr -d '\r')
@@ -181,13 +181,12 @@ if [ "${format}" == "sarif" ] && [ "${limitSeveritiesForSARIF}" != "true" ]; the
elif [ $trivyConfig ]; then
echo "Running Trivy with trivy.yaml config from: " $trivyConfig
trivy --config $trivyConfig ${scanType} ${artifactRef}
returnCode=$?
else
echo "Running trivy with options: trivy ${scanType} ${ARGS}" "${artifactRef}"
echo "Global options: " "${GLOBAL_ARGS}"
trivy $GLOBAL_ARGS ${scanType} ${ARGS} ${artifactRef}
returnCode=$?
fi
returnCode=$?
set -e
if [[ "${format}" == "github" ]]; then