x

Signed-off-by: Derek Nola <[email protected]>
dereknola · Sep 11, 2024 · ca79611 · ca79611
1 parent 511f734
commit ca79611
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/.github/workflows/trivy.yaml b/.github/workflows/trivy.yaml
@@ -32,17 +32,16 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Build RKE2 Image
-      run: SKIP_WINDOWS=true make build-image-runtime
-    - name: Save Runtime Tag
-      id: rke2-tag
+      id: build-image
       run: |
+        SKIP_WINDOWS=true make build-image-runtime
         TAG=$(docker images --format "{{.Repository}}:{{.Tag}} {{.CreatedAt}}" | grep "rancher/rke2-runtime" | sort -k2 -r | head -n1 | awk '{print $1}')
         echo "TAG=${TAG}" >> "$GITHUB_OUTPUT"
 
     - name: Run Trivy vulnerability scanner
       uses: aquasecurity/[email protected]
       with:
-        image-ref: 'rancher/rke2-runtime:${{ steps.rke2-tag.outputs.TAG }}'
+        image-ref: '${{ steps.build-image.outputs.TAG }}'
         format: 'table'
         severity: "HIGH,CRITICAL"
         output: "trivy-report.txt"