From d5a2bc1a54d2b3d2a5535eec11bf66a64c92131b Mon Sep 17 00:00:00 2001
From: Leonard Gram <leo@xlson.com>
Date: Wed, 19 Feb 2020 16:10:22 +0100
Subject: [PATCH] CI: check ubuntu and alpine images with trivy (#22314)

* CI: check ubuntu and alpine images with trivy

* CI: clear trivy cache before running
---
 .circleci/config.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6bd7334cb7d..325b78c3e7f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1898,8 +1898,14 @@ jobs:
             tar zxvf trivy_${VERSION}_Linux-64bit.tar.gz
             sudo mv trivy /usr/local/bin
       - run:
-          name: Scan the latest grafana master image with trivy
-          command: trivy --exit-code 1 --quiet --auto-refresh --clear-cache grafana/grafana:master
+          name: Clear trivy cache
+          command: trivy --clear-cache
+      - run:
+          name: Scan the latest grafana master alpine image with trivy
+          command: trivy --exit-code 1 grafana/grafana:master
+      - run:
+          name: Scan the latest grafana master ubuntu image with trivy
+          command: trivy --exit-code 1 grafana/grafana:master-ubuntu
       - save_cache:
           key: vulnerability-db
           paths: