ZeroDownTime/KubeZero
3
0
Fork 0
Code Issues 1 Pull Requests 25 Packages Projects Releases Wiki Activity

fix: fix quotes, do not execute scan during push

Browse Source
This commit is contained in:
Stefan Reimer 2022-02-14 13:35:13 +01:00
parent d2b10dd30b
commit 2c69869deb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
podman.mk
View File

@ -26,7 +26,7 @@ scan: build
@echo "Scanning $(IMAGE):$(TAG) using Trivy" @echo "Scanning $(IMAGE):$(TAG) using Trivy"
@trivy $(TRIVY_OPTS) $(IMAGE):$(TAG) @trivy $(TRIVY_OPTS) $(IMAGE):$(TAG)
push: scan push: build
@aws ecr-public get-login-password --region $(REGION) | docker login --username AWS --password-stdin $(REGISTRY) @aws ecr-public get-login-password --region $(REGION) | docker login --username AWS --password-stdin $(REGISTRY)
@docker tag $(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):latest @docker tag $(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):latest
docker push $(REGISTRY)/$(IMAGE):$(TAG) docker push $(REGISTRY)/$(IMAGE):$(TAG)

2
vars/buildPodman.groovy
View File

@ -49,7 +49,7 @@ def call(Map config=[:]) {
] ]
// Scan again and fail on CRITICAL vulns // Scan again and fail on CRITICAL vulns
sh '[ "${config.trivyFail}" == "NONE" ] || TRIVY_EXIT_CODE=1 TRIVY_SEVERITY=${config.trivyFail} make scan' sh "[ \"${config.trivyFail}\" == \"NONE\" ] || TRIVY_EXIT_CODE=1 TRIVY_SEVERITY=${config.trivyFail} make scan"
} }
} }