Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b6a709cf9 | ||
|
|
47e481a388 | ||
|
|
7b07fa7d6a | ||
|
|
f78e9ecf42 |
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
FROM ghcr.io/aquasecurity/trivy:0.46.0
|
FROM ghcr.io/aquasecurity/trivy:0.47.0
|
||||||
COPY entrypoint.sh /
|
COPY entrypoint.sh /
|
||||||
RUN apk --no-cache add bash curl npm
|
RUN apk --no-cache add bash curl npm
|
||||||
RUN chmod +x /entrypoint.sh
|
RUN chmod +x /entrypoint.sh
|
||||||
|
|||||||
+2
-3
@@ -77,7 +77,7 @@ done
|
|||||||
|
|
||||||
scanType=$(echo $scanType | tr -d '\r')
|
scanType=$(echo $scanType | tr -d '\r')
|
||||||
export artifactRef="${imageRef}"
|
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')
|
artifactRef=$(echo $scanRef | tr -d '\r')
|
||||||
fi
|
fi
|
||||||
input=$(echo $input | tr -d '\r')
|
input=$(echo $input | tr -d '\r')
|
||||||
@@ -181,13 +181,12 @@ if [ "${format}" == "sarif" ] && [ "${limitSeveritiesForSARIF}" != "true" ]; the
|
|||||||
elif [ $trivyConfig ]; then
|
elif [ $trivyConfig ]; then
|
||||||
echo "Running Trivy with trivy.yaml config from: " $trivyConfig
|
echo "Running Trivy with trivy.yaml config from: " $trivyConfig
|
||||||
trivy --config $trivyConfig ${scanType} ${artifactRef}
|
trivy --config $trivyConfig ${scanType} ${artifactRef}
|
||||||
returnCode=$?
|
|
||||||
else
|
else
|
||||||
echo "Running trivy with options: trivy ${scanType} ${ARGS}" "${artifactRef}"
|
echo "Running trivy with options: trivy ${scanType} ${ARGS}" "${artifactRef}"
|
||||||
echo "Global options: " "${GLOBAL_ARGS}"
|
echo "Global options: " "${GLOBAL_ARGS}"
|
||||||
trivy $GLOBAL_ARGS ${scanType} ${ARGS} ${artifactRef}
|
trivy $GLOBAL_ARGS ${scanType} ${ARGS} ${artifactRef}
|
||||||
returnCode=$?
|
|
||||||
fi
|
fi
|
||||||
|
returnCode=$?
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
if [[ "${format}" == "github" ]]; then
|
if [[ "${format}" == "github" ]]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user