diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63b178268b7bca290acba2ef89ad951181cfc985..c0022d83f2bd5ab74fdc3cfb0a04582318d6eb98 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/Dockerfile b/Dockerfile index 1a4e4487ce93bf4ca4e7dde9c795494e09a652de..7bc1b9763630f689017210edc3d204b10bd47bc1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG FROM_IMAGE=usgs/centos:latest +ARG FROM_IMAGE=usgs/centos:7 FROM ${FROM_IMAGE} as conda LABEL maintainer="Jeremy Fee <jmfee@usgs.gov>"