Skip to content

Commit

Permalink
fix: merge with master- entrypoint
Browse files Browse the repository at this point in the history
  • Loading branch information
krol3 committed Jul 30, 2022
1 parent d0dd7b4 commit c32abb3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions entrypoint.sh
Expand Up @@ -163,13 +163,13 @@ fi

trivyConfig=$(echo $trivyConfig | tr -d '\r')
if [ $trivyConfig ]; then
echo "Running Trivy with trivy.yaml config from: " $trivyConfig
trivy --config $trivyConfig ${scanType} $ARGS ${artifactRef}
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}
trivy $GLOBAL_ARGS ${scanType} ${ARGS} ${artifactRef}
returnCode=$?
fi

Expand Down

0 comments on commit c32abb3

Please sign in to comment.