From d2a8952d52b848cfb7d8821dccbcd418cf093c55 Mon Sep 17 00:00:00 2001
From: Jeremy Fee <jmfee@usgs.gov>
Date: Fri, 11 Sep 2020 11:25:00 -0600
Subject: [PATCH] Update trivy install
---
.dockerignore | 4 +++-
.gitlab-ci.yml | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.dockerignore b/.dockerignore
index bbd458dc..1cdb2530 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,8 @@
.coverage
.DS_Store
.git
+.pytest_cache
+coverage.xml
node_modules
+test
*.pyc
-coverage.xml
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d196d988..d4d31bfa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -167,7 +167,7 @@ Scan Docker Image:
- tags@ghsc/geomag/geomag-algorithms
script:
# install trivy
- - apk add --update-cache --upgrade curl rpm
+ - apk add --update-cache --upgrade curl grep rpm sed
- VERSION=$(
curl --silent "https://api.github.com/repos/aquasecurity/trivy/releases/latest" | \
grep '"tag_name":' | \
@@ -176,7 +176,7 @@ Scan Docker Image:
- wget https://github.com/aquasecurity/trivy/releases/download/v${VERSION}/trivy_${VERSION}_Linux-64bit.tar.gz
- tar zxvf trivy_${VERSION}_Linux-64bit.tar.gz
# run trivy
- - trivy --exit-code 0 --no-progress ${INTERNAL_IMAGE}
+ - ./trivy --exit-code 0 --no-progress ${INTERNAL_IMAGE}
services:
- docker:19.03-dind
stage: scan
--
GitLab