Skip to content

Commit 4fa1f28

Browse files
author
Vitaly Korolev
committed
Add BlackDuck scan
1 parent fa8a5eb commit 4fa1f28

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Jenkinsfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ void imageScan() {
149149
sh '''rm -f dep-image-scan.txt'''
150150

151151
// trigger BlackDuck scan
152-
def imageList = readFile(file: 'helm_image.list').trim()
152+
def rawImageList = readFile(file: 'helm_image.list').trim()
153+
def imageList = rawImageList.endsWith(',') ? rawImageList[0..-2] : rawImageList
153154
build job: 'securityscans/Blackduck/cloud/kubernetes-helm', wait: false, parameters: [ string(name: 'branch', value: "${env.BRANCH_NAME}"), string(name: 'CONTAINER_IMAGES', value: "${imageList}") ]
154155
}
155156

makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,11 @@ upgrade-test: prepare
233233
.PHONY: image-scan
234234
image-scan:
235235

236+
@rm -f helm_image.list dep-image-scan.txt
236237
@echo "=====Scan dependent Docker images in charts/values.yaml" $(if $(saveOutput), | tee -a dep-image-scan.txt,)
237238
@for depImage in $(shell grep -E "^\s*\bimage:\s+(.*)" charts/values.yaml | sed 's/image: //g' | sed 's/"//g'); do\
238239
echo -n "$${depImage}," >> helm_image.list ; \
239240
echo "= $${depImage}:" $(if $(saveOutput), | tee -a dep-image-scan.txt,) ; \
240241
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock anchore/grype:latest --output json $${depImage} | jq -r '[(.matches[] | [.artifact.name, .artifact.version, .vulnerability.id, .vulnerability.severity])] | .[] | @tsv' | sort -k4 | column -t $(if $(saveOutput), | tee -a dep-image-scan.txt,);\
241242
echo $(if $(saveOutput), | tee -a dep-image-scan.txt,) ;\
242243
done
243-
@sed -i 's/,$//' helm_image.list
244-

0 commit comments

Comments
 (0)