From f997f85eb7963fdd01cc5e5ab623c8593fb6160b Mon Sep 17 00:00:00 2001 From: Leonard Gram Date: Wed, 15 Apr 2020 12:07:49 +0200 Subject: [PATCH] CI: scan master and release images oss/enterprise (#23475) --- .circleci/config.yml | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d46d5354089..3dfc9e5e4f0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -864,7 +864,7 @@ jobs: command: "./scripts/ci-job-succeeded.sh" when: on_success - scan-docker-master: + scan-docker-images: docker: - image: circleci/buildpack-deps:stretch steps: @@ -887,11 +887,29 @@ jobs: name: Clear trivy cache command: trivy --clear-cache - run: - name: Scan the latest grafana master alpine image with trivy + name: Scan grafana/grafana:master command: trivy --exit-code 1 grafana/grafana:master - run: - name: Scan the latest grafana master ubuntu image with trivy + name: Scan grafana/grafana:master-ubuntu command: trivy --exit-code 1 grafana/grafana:master-ubuntu + - run: + name: Scan grafana/grafana-enterprise:master + command: trivy --exit-code 1 grafana/grafana-enterprise:master + - run: + name: Scan grafana/grafana-enterprise:master-ubuntu + command: trivy --exit-code 1 grafana/grafana-enterprise:master-ubuntu + - run: + name: Scan grafana/grafana:latest + command: trivy --exit-code 1 grafana/grafana:latest + - run: + name: Scan grafana/grafana:latest-ubuntu + command: trivy --exit-code 1 grafana/grafana:latest-ubuntu + - run: + name: Scan grafana/grafana-enterprise:latest + command: trivy --exit-code 1 grafana/grafana-enterprise:latest + - run: + name: Scan grafana/grafana-enterprise:latest-ubuntu + command: trivy --exit-code 1 grafana/grafana-enterprise:latest-ubuntu - save_cache: key: vulnerability-db paths: @@ -1227,4 +1245,4 @@ workflows: cron: "0 0 * * *" filters: *filter-only-master jobs: - - scan-docker-master + - scan-docker-images