Skip to content

Commit 1d30fa1

Browse files
committed
ci: generate sbom via trivy
1 parent 44afef1 commit 1d30fa1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ scan-images:
5252
docker build -t nimbus-control-plane:ci .; \
5353
fi
5454
@if [ "$(SBOM_OUTPUT)" = "1" ]; then \
55-
docker sbom nimbus-control-plane:ci --format cyclonedx --output $(SBOM_DIR)/nimbus-control-plane.cdx.json || echo "docker sbom unavailable; skipping SBOM" >&2; \
55+
trivy image --format cyclonedx --output $(SBOM_DIR)/nimbus-control-plane.cdx.json nimbus-control-plane:ci || echo "trivy sbom generation failed; skipping SBOM" >&2; \
5656
fi
5757
trivy image --exit-code 1 --severity $(TRIVY_SEVERITY) --ignore-unfixed --no-progress nimbus-control-plane:ci
5858
@if docker buildx version >/dev/null 2>&1; then \
@@ -62,7 +62,7 @@ scan-images:
6262
docker build -t nimbus-ai-runner:ci containers/ai-eval-runner; \
6363
fi
6464
@if [ "$(SBOM_OUTPUT)" = "1" ]; then \
65-
docker sbom nimbus-ai-runner:ci --format cyclonedx --output $(SBOM_DIR)/nimbus-ai-runner.cdx.json || echo "docker sbom unavailable; skipping SBOM" >&2; \
65+
trivy image --format cyclonedx --output $(SBOM_DIR)/nimbus-ai-runner.cdx.json nimbus-ai-runner:ci || echo "trivy sbom generation failed; skipping SBOM" >&2; \
6666
fi
6767
trivy image --exit-code 1 --severity $(TRIVY_SEVERITY) --ignore-unfixed --no-progress nimbus-ai-runner:ci
6868
if [ "$(KEEP_IMAGES)" != "1" ]; then \

0 commit comments

Comments
 (0)