From 69cd026a7a3cdd9fd7d4a38103f4ab1ae23fd176 Mon Sep 17 00:00:00 2001 From: Matthew McClaskey Date: Tue, 21 Nov 2023 20:34:09 +0000 Subject: [PATCH] wip trivvy --- ci-scripts/gitlab-ci.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-scripts/gitlab-ci.template b/ci-scripts/gitlab-ci.template index 0f81187..8faed46 100644 --- a/ci-scripts/gitlab-ci.template +++ b/ci-scripts/gitlab-ci.template @@ -138,7 +138,7 @@ scan_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}: script: - apk add bash - (cd ci-scripts && bash download-trivy) - - bash ci/scan image ${ORG_NAME}/image-cache-private:$(arch)-core-{{ IMAGE.name1 }}-{{ IMAGE.name2 }}-${SANITIZED_BRANCH}-${CI_PIPELINE_ID} + - bash ci-scripts/scan image ${ORG_NAME}/image-cache-private:$(arch)-core-{{ IMAGE.name1 }}-{{ IMAGE.name2 }}-${SANITIZED_BRANCH}-${CI_PIPELINE_ID} {% if FILE_LIMITS %}only: changes: {% for FILE in files %}- {{ FILE }} @@ -168,7 +168,7 @@ scan_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}: script: - apk add bash - (cd ci-scripts && bash download-trivy) - - bash ci/scan image ${ORG_NAME}/image-cache-private:x86_64-core-{{ IMAGE.name1 }}-{{ IMAGE.name2 }}-${SANITIZED_BRANCH}-${CI_PIPELINE_ID} + - bash ci-scripts/scan image ${ORG_NAME}/image-cache-private:x86_64-core-{{ IMAGE.name1 }}-{{ IMAGE.name2 }}-${SANITIZED_BRANCH}-${CI_PIPELINE_ID} {% if FILE_LIMITS %}only: changes: {% for FILE in files %}- {{ FILE }}