From ca19af1aa0393d58c34aa8105eee99c9ea664115 Mon Sep 17 00:00:00 2001
From: Steven B <genseb7@gmail.com>
Date: Sat, 13 Feb 2021 13:57:44 -0500
Subject: [PATCH 1/3] Create trivy-analysis.yml

---
 .github/workflows/trivy-analysis.yml | 30 ++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/workflows/trivy-analysis.yml

diff --git a/.github/workflows/trivy-analysis.yml b/.github/workflows/trivy-analysis.yml
new file mode 100644
index 0000000..88008a2
--- /dev/null
+++ b/.github/workflows/trivy-analysis.yml
@@ -0,0 +1,30 @@
+name: build
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+jobs:
+  build:
+    name: Build
+    runs-on: "ubuntu-18.04"
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Build an image from Dockerfile
+        run: |
+          docker build -t docker.io/my-organization/my-app:${{ github.sha }} .
+
+      - name: Run Trivy vulnerability scanner
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'docker.io/my-organization/my-app:${{ github.sha }}'
+          format: 'template'
+          template: '@/contrib/sarif.tpl'
+          output: 'trivy-results.sarif'
+          severity: 'CRITICAL,HIGH'
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: 'trivy-results.sarif'

From 62cb4675a8120112fb0f7978ebd95579c9fff550 Mon Sep 17 00:00:00 2001
From: Steven B <genseb7@gmail.com>
Date: Sat, 13 Feb 2021 13:58:47 -0500
Subject: [PATCH 2/3] push all

---
 .github/workflows/trivy-analysis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/trivy-analysis.yml b/.github/workflows/trivy-analysis.yml
index 88008a2..1ddd811 100644
--- a/.github/workflows/trivy-analysis.yml
+++ b/.github/workflows/trivy-analysis.yml
@@ -1,13 +1,14 @@
 name: build
 on:
   push:
-    branches: [ master ]
   pull_request:
+    
 jobs:
   build:
     name: Build
     runs-on: "ubuntu-18.04"
     steps:
+      
       - name: Checkout code
         uses: actions/checkout@v2
 

From e02565cc627f62db78f48c9438024366b2f03726 Mon Sep 17 00:00:00 2001
From: Steven B <genseb7@gmail.com>
Date: Sat, 13 Feb 2021 13:59:44 -0500
Subject: [PATCH 3/3] descriptive name

---
 .github/workflows/trivy-analysis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/trivy-analysis.yml b/.github/workflows/trivy-analysis.yml
index 1ddd811..fbdfd70 100644
--- a/.github/workflows/trivy-analysis.yml
+++ b/.github/workflows/trivy-analysis.yml
@@ -1,11 +1,11 @@
-name: build
+name: Vulnerability Scan (Trivy)
 on:
   push:
   pull_request:
     
 jobs:
   build:
-    name: Build
+    name: Build and Scan
     runs-on: "ubuntu-18.04"
     steps: