From 4a9f825410a6b1c48e1c20ffb9fd82d245816741 Mon Sep 17 00:00:00 2001
From: divolgin <dmitriy@replicated.com>
Date: Tue, 12 Sep 2023 19:25:58 +0000
Subject: [PATCH] Make and readme updates with info used to make this release

---
 .circleci/config.yml | 7 +------
 .gitignore           | 1 +
 Makefile             | 9 +++++++++
 README.md            | 6 ++++++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8d3d15d22..34abe14da 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,15 +30,10 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker
-      - run:
-          name: Build image
-          command: |
-            docker build --pull -t replicated/support-bundle:base -f deploy/Dockerfile-base deploy/
       - run:
           name: Run local image vulnerability scan
           command: |
-            curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s -- -b .
-            ./grype --fail-on=medium --only-fixed --config=.circleci/.anchore/grype.yaml -vv replicated/support-bundle:base
+            make scan-base
 
   e2e:
     # Use machine for volume binding support in Docker
diff --git a/.gitignore b/.gitignore
index 1d8d51414..955600c85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 *.out
 
 .DS_Store
+grype
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 0cf98b48a..3f27edf6d 100644
--- a/Makefile
+++ b/Makefile
@@ -221,3 +221,12 @@ support-bundle-generate: goreleaser
 	@mkdir -p .state
 	docker build --pull -t replicated/support-bundle:base -f deploy/Dockerfile-base deploy/
 	@touch .state/base
+
+grype:
+	curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s -- -b .
+
+build-base:
+	docker build --pull -t replicated/support-bundle:base -f deploy/Dockerfile-base deploy/
+
+scan-base: build-base grype
+	./grype --fail-on=medium --only-fixed --config=.circleci/.anchore/grype.yaml -vv replicated/support-bundle:base
\ No newline at end of file
diff --git a/README.md b/README.md
index cc5062679..4eed59bc3 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,12 @@ make test
 make e2e-supportbundle-core e2e-supportbundle-docker
 ```
 
+## Scanning image prior to release
+
+```
+make scan-base
+```
+
 ## Releases
 
 Releases are created on CircleCI when a tag is pushed.