From ebc2d89b10bc444b33055f0ee5bd2b4f0635cd04 Mon Sep 17 00:00:00 2001
From: Marcel Feix <marcel.feix@exxcellent.de>
Date: Wed, 13 Oct 2021 10:40:08 +0000
Subject: [PATCH] chore(Container Scan): Make timeout longer. Trivy says this
 can provide against Context Timeouts
 https://aquasecurity.github.io/trivy/v0.18.1/faq/

---
 container-scan.gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/container-scan.gitlab-ci.yml b/container-scan.gitlab-ci.yml
index 4ec359d..a335146 100644
--- a/container-scan.gitlab-ci.yml
+++ b/container-scan.gitlab-ci.yml
@@ -10,8 +10,8 @@
     - tar zxvf trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz
   script:
     - mvn $MAVEN_CLI_OPTS compile jib:buildTar -DskipTests
-    - ./trivy --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code 0 --cache-dir .trivycache/ --severity HIGH,CRITICAL --no-progress --format template --template "@contrib/junit.tpl" -o junit-report.xml --input target/jib-image.tar
-    - ./trivy --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code $EXITCODE --cache-dir .trivycache/ --severity HIGH,CRITICAL --no-progress --input target/jib-image.tar
+    - ./trivy --timeout 15m --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code 0 --cache-dir .trivycache/ --severity HIGH,CRITICAL --no-progress --format template --template "@contrib/junit.tpl" -o junit-report.xml --input target/jib-image.tar
+    - ./trivy --timeout 15m --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code $EXITCODE --cache-dir .trivycache/ --severity HIGH,CRITICAL --no-progress --input target/jib-image.tar
   cache:
     paths:
       - .trivycache/
@@ -33,8 +33,8 @@
     - tar zxvf trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz
   script:
     - ./gradlew jibBuildTar -DskipTests
-    - ./trivy --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code 0 --cache-dir .trivycache/ --severity HIGH,CRITICAL --no-progress --format template --template "@contrib/junit.tpl" -o junit-report.xml --input $PROJECT_DIR/jib-image.tar
-    - ./trivy --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code $EXITCODE --cache-dir .trivycache/ --severity HIGH,CRITICAL --no-progress --input $PROJECT_DIR/jib-image.tar
+    - ./trivy --timeout 15m --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code 0 --cache-dir .trivycache/ --severity HIGH,CRITICAL --no-progress --format template --template "@contrib/junit.tpl" -o junit-report.xml --input $PROJECT_DIR/jib-image.tar
+    - ./trivy --timeout 15m --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code $EXITCODE --cache-dir .trivycache/ --severity HIGH,CRITICAL --no-progress --input $PROJECT_DIR/jib-image.tar
   cache:
     paths:
       - .trivycache/
@@ -59,8 +59,8 @@
     - tar zxvf trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz
   script:
     - /kaniko/executor --context $CONTEXT_LOCATION --dockerfile $DOCKERFILE_LOCATION --cache-dir cache/image --tarPath  image.tar --no-push --destination image --skip-tls-verify
-    - ./trivy --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code 0 --cache-dir .trivycache/ --severity HIGH,CRITICAL --format template --template "@contrib/junit.tpl" -o junit-report.xml --input image.tar
-    - ./trivy --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code $EXITCODE --cache-dir .trivycache/ --severity HIGH,CRITICAL  --input image.tar
+    - ./trivy --timeout 15m --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code 0 --cache-dir .trivycache/ --severity HIGH,CRITICAL --format template --template "@contrib/junit.tpl" -o junit-report.xml --input image.tar
+    - ./trivy --timeout 15m --cache-dir .trivycache/ $TRIVY_EXTRA_ARGS --exit-code $EXITCODE --cache-dir .trivycache/ --severity HIGH,CRITICAL  --input image.tar
   cache:
     paths:
       - .trivycache/