From 6917a76dd6c51b41546bd0134ad250fbdea8fe9b Mon Sep 17 00:00:00 2001
From: Jeremy Fee <jmfee@usgs.gov>
Date: Fri, 11 Sep 2020 12:13:41 -0600
Subject: [PATCH] Update base image (to one supported by trivy), update trivy
command
---
.gitlab-ci.yml | 2 +-
Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 63b17826..c0022d83 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 1a4e4487..7bc1b976 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>"
--
GitLab