ci(scan): add Grype scanning alongside Trivy; fix --vuln-type flag
Add anchore/grype:v0.88.0 as a second vulnerability scanner in the scan job. Both images are scanned with Grype after Trivy — using --fail-on high --only-fixed to match Trivy's HIGH/CRITICAL + ignore-unfixed gate. Having two independent scanners catches CVEs that may be missing from either database. Also fix a typo in the Trivy claude scan step: --package-type is not a valid Trivy flag; corrected to --vuln-type (matching the proxy step). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
b741b02408
commit
71494a59b3
1 changed files with 21 additions and 2 deletions
|
|
@ -11,6 +11,7 @@ env:
|
||||||
FORGEJO_HOST: code.zeidler.dev
|
FORGEJO_HOST: code.zeidler.dev
|
||||||
HELM_EXPERIMENTAL_OCI: 1
|
HELM_EXPERIMENTAL_OCI: 1
|
||||||
TRIVY_IMAGE: registry.zeidler.dev/docker-hub/aquasec/trivy:0.70.0
|
TRIVY_IMAGE: registry.zeidler.dev/docker-hub/aquasec/trivy:0.70.0
|
||||||
|
GRYPE_IMAGE: registry.zeidler.dev/docker-hub/anchore/grype:v0.88.0
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
check-docker:
|
check-docker:
|
||||||
|
|
@ -61,7 +62,7 @@ jobs:
|
||||||
--format cyclonedx --output /output/sbom-proxy.cdx.json \
|
--format cyclonedx --output /output/sbom-proxy.cdx.json \
|
||||||
scan/proxy:latest
|
scan/proxy:latest
|
||||||
|
|
||||||
- name: Scan proxy image
|
- name: Scan proxy image (Trivy)
|
||||||
run: |
|
run: |
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||||
|
|
@ -71,6 +72,15 @@ jobs:
|
||||||
--format table \
|
--format table \
|
||||||
scan/proxy:latest
|
scan/proxy:latest
|
||||||
|
|
||||||
|
- name: Scan proxy image (Grype)
|
||||||
|
run: |
|
||||||
|
docker run --rm \
|
||||||
|
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||||
|
${{ env.GRYPE_IMAGE }} \
|
||||||
|
docker:scan/proxy:latest \
|
||||||
|
--fail-on high \
|
||||||
|
--only-fixed
|
||||||
|
|
||||||
- name: Build claude image for scanning
|
- name: Build claude image for scanning
|
||||||
run: docker build -t scan/claude:latest ./claude
|
run: docker build -t scan/claude:latest ./claude
|
||||||
|
|
||||||
|
|
@ -84,7 +94,7 @@ jobs:
|
||||||
--format cyclonedx --output /output/sbom-claude.cdx.json \
|
--format cyclonedx --output /output/sbom-claude.cdx.json \
|
||||||
scan/claude:latest
|
scan/claude:latest
|
||||||
|
|
||||||
- name: Scan claude image
|
- name: Scan claude image (Trivy)
|
||||||
run: |
|
run: |
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||||
|
|
@ -94,6 +104,15 @@ jobs:
|
||||||
--format table \
|
--format table \
|
||||||
scan/claude:latest
|
scan/claude:latest
|
||||||
|
|
||||||
|
- name: Scan claude image (Grype)
|
||||||
|
run: |
|
||||||
|
docker run --rm \
|
||||||
|
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||||
|
${{ env.GRYPE_IMAGE }} \
|
||||||
|
docker:scan/claude:latest \
|
||||||
|
--fail-on high \
|
||||||
|
--only-fixed
|
||||||
|
|
||||||
- name: Upload SBOMs
|
- name: Upload SBOMs
|
||||||
if: always()
|
if: always()
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue