fix: merge with master- entrypoint

aquasecurity · Jul 30, 2022 · 7de4b70 · 7de4b70
1 parent 5144f05
commit 7de4b70
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3,344 deletions.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -163,13 +163,21 @@ fi
 
 trivyConfig=$(echo $trivyConfig | tr -d '\r')
 if [ $trivyConfig ]; then
+<<<<<<< HEAD
    echo "Running Trivy with trivy.yaml config from: " $trivyConfig
    trivy --config $trivyConfig ${scanType} ${artifactRef}
+||||||| parent of c32abb3 (fix: merge with master- entrypoint)
+   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}
+>>>>>>> c32abb3 (fix: merge with master- entrypoint)
    returnCode=$?
 else
    echo "Running trivy with options: ${ARGS}" "${artifactRef}"
    echo "Global options: " "${GLOBAL_ARGS}"
-   trivy $GLOBAL_ARGS ${scanType} $ARGS ${artifactRef}
+   trivy $GLOBAL_ARGS ${scanType} ${ARGS} ${artifactRef}
    returnCode=$?
 fi