Skip to content
Snippets Groups Projects
Commit 7e18938a authored by Jeremy M Fee's avatar Jeremy M Fee
Browse files

Merge branch 'update-trivy' into 'master'

Update trivy

See merge request !24
parents 36f1b9cb ed79c061
No related branches found
No related tags found
2 merge requests!146Release CMO metadata to production,!24Update trivy
Pipeline #21551 failed
.coverage .coverage
.DS_Store .DS_Store
.git .git
.pytest_cache
coverage.xml
node_modules node_modules
test
*.pyc *.pyc
coverage.xml
\ No newline at end of file
...@@ -167,7 +167,7 @@ Scan Docker Image: ...@@ -167,7 +167,7 @@ Scan Docker Image:
- tags@ghsc/geomag/geomag-algorithms - tags@ghsc/geomag/geomag-algorithms
script: script:
# install trivy # install trivy
- apk add --update-cache --upgrade curl rpm - apk add --update-cache --upgrade curl grep rpm sed
- VERSION=$( - VERSION=$(
curl --silent "https://api.github.com/repos/aquasecurity/trivy/releases/latest" | \ curl --silent "https://api.github.com/repos/aquasecurity/trivy/releases/latest" | \
grep '"tag_name":' | \ grep '"tag_name":' | \
...@@ -176,7 +176,7 @@ Scan Docker Image: ...@@ -176,7 +176,7 @@ Scan Docker Image:
- wget https://github.com/aquasecurity/trivy/releases/download/v${VERSION}/trivy_${VERSION}_Linux-64bit.tar.gz - wget https://github.com/aquasecurity/trivy/releases/download/v${VERSION}/trivy_${VERSION}_Linux-64bit.tar.gz
- tar zxvf trivy_${VERSION}_Linux-64bit.tar.gz - tar zxvf trivy_${VERSION}_Linux-64bit.tar.gz
# run trivy # run trivy
- trivy --exit-code 0 --no-progress ${INTERNAL_IMAGE} - ./trivy --exit-code 0 --no-progress ${INTERNAL_IMAGE}
services: services:
- docker:19.03-dind - docker:19.03-dind
stage: scan stage: scan
......
...@@ -4,10 +4,12 @@ url = "https://pypi.org/simple" ...@@ -4,10 +4,12 @@ url = "https://pypi.org/simple"
verify_ssl = true verify_ssl = true
[dev-packages] [dev-packages]
bandit = "*"
black = "==20.8b1" black = "==20.8b1"
pre-commit = "*" pre-commit = "*"
pytest = "*" pytest = "*"
pytest-cov = "*" pytest-cov = "*"
safety = "*"
webtest = "*" webtest = "*"
[packages] [packages]
......
This diff is collapsed.
...@@ -17,3 +17,4 @@ pipenv --site-packages install --dev --pre --skip-lock ...@@ -17,3 +17,4 @@ pipenv --site-packages install --dev --pre --skip-lock
# Run Code Checks # Run Code Checks
pipenv run black --check . pipenv run black --check .
pipenv run pytest --cov-report xml:cov.xml --cov=geomagio pipenv run pytest --cov-report xml:cov.xml --cov=geomagio
pipenv run safety check
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment