Merge branch 'update-trivy-3' into 'master'

Update base image (to one supported by trivy), update trivy command

See merge request !26

.gitlab-ci.yml

@@ -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 --exit-code 0 --no-progress ${INTERNAL_IMAGE}
+    - ./trivy image --exit-code 0 --no-progress ${INTERNAL_IMAGE}
   services:
     - docker:19.03-dind
   stage: scan

Dockerfile

-ARG FROM_IMAGE=usgs/centos:latest
+ARG FROM_IMAGE=usgs/centos:7
 
 FROM ${FROM_IMAGE} as conda
 LABEL maintainer="Jeremy Fee <jmfee@usgs.gov>"