Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
geomag-algorithms
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ghsc
National Geomagnetism Program
geomag-algorithms
Commits
7e18938a
Commit
7e18938a
authored
4 years ago
by
Jeremy M Fee
Browse files
Options
Downloads
Plain Diff
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
!146
Release CMO metadata to production
,
!24
Update trivy
Pipeline
#21551
failed
4 years ago
Stage: test
Stage: integration
Stage: scan
Stage: deploy
Changes
5
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.dockerignore
+3
-1
3 additions, 1 deletion
.dockerignore
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
Pipfile
+2
-0
2 additions, 0 deletions
Pipfile
Pipfile.lock
+562
-382
562 additions, 382 deletions
Pipfile.lock
scripts/ci_check_code.sh
+1
-0
1 addition, 0 deletions
scripts/ci_check_code.sh
with
570 additions
and
385 deletions
.dockerignore
+
3
−
1
View file @
7e18938a
.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
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
2
−
2
View file @
7e18938a
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Pipfile
+
2
−
0
View file @
7e18938a
...
@@ -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.8
b
1
"
black
=
"=
=
20.8
b
1
"
pre-commit
=
"*"
pre-commit
=
"*"
pytest
=
"*"
pytest
=
"*"
pytest-cov
=
"*"
pytest-cov
=
"*"
safety
=
"*"
webtest
=
"*"
webtest
=
"*"
[packages]
[packages]
...
...
This diff is collapsed.
Click to expand it.
Pipfile.lock
+
562
−
382
View file @
7e18938a
This diff is collapsed.
Click to expand it.
scripts/ci_check_code.sh
+
1
−
0
View file @
7e18938a
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment