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

Merge branch '1.1.0-rc' into 'master'

1.1.0 rc

See merge request !29
parents 4cf8e09b 359a8d5b
No related branches found
No related tags found
2 merge requests!146Release CMO metadata to production,!291.1.0 rc
Pipeline #21694 passed
......@@ -171,7 +171,7 @@ Scan Docker Image:
- wget https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz
- tar zxvf trivy_${TRIVY_VERSION}_Linux-64bit.tar.gz
# run trivy
- ./trivy image ${INTERNAL_IMAGE_NAME}
- ./trivy image --no-progress --exit-code 1 --severity HIGH,CRITICAL ${INTERNAL_IMAGE_NAME}
services:
- docker:19.03-dind
stage: scan
......
{
"name": "geomag-algorithms",
"version": "1.0.0",
"version": "1.1.0",
"homepage": "http://geomag.usgs.gov/",
"repository": "https://github.com/usgs/geomag-algorithms.git",
"description": "Geomagnetism algorithms.",
......
......@@ -9,7 +9,7 @@ if ssl_cert_file:
setuptools.setup(
name="geomag-algorithms",
version="1.0.0",
version="1.1.0",
description="USGS Geomag Algorithms Library",
url="https://github.com/usgs/geomag-algorithms",
packages=setuptools.find_packages(exclude=["test*"]),
......
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