Skip to content

Commit 30f6eab

Browse files
author
Vitaly Korolev
committed
sed fix
1 parent 71c608f commit 30f6eab

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
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
Original file line numberDiff line numberDiff line change
@@ -240,4 +240,3 @@ image-scan:
240240
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,);\
241241
echo $(if $(saveOutput), | tee -a dep-image-scan.txt,) ;\
242242
done
243-
@sed 's/,$//g' helm_image.list > helm_image.list.tmp && mv helm_image.list.tmp helm_image.list

0 commit comments

Comments
 (0)