diff --git a/.dockerignore b/.dockerignore index bbd458dcf488e8c522fbae7923909f96a4327383..1cdb253059fe20ed6b6229d896d19f7074680fee 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 d196d988575cc587841d0464fad494760cc2fd9a..d4d31bfa27424094ebe633468be9db225288741e 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