From b6fea5a0a63a679f8e7cd334811ab52f4a7c2c41 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Mon, 14 Feb 2022 13:35:13 +0100
Subject: [PATCH] fix: fix quotes, do not execute scan during push

---
 podman.mk               | 2 +-
 vars/buildPodman.groovy | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/podman.mk b/podman.mk
index fb68db6..6f2bdcd 100644
--- a/podman.mk
+++ b/podman.mk
@@ -26,7 +26,7 @@ scan: build
 	@echo "Scanning $(IMAGE):$(TAG) using Trivy"
 	@trivy $(TRIVY_OPTS) $(IMAGE):$(TAG)
 
-push: scan
+push: build
 	@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 push $(REGISTRY)/$(IMAGE):$(TAG)
diff --git a/vars/buildPodman.groovy b/vars/buildPodman.groovy
index 99bfd08..8479c1d 100644
--- a/vars/buildPodman.groovy
+++ b/vars/buildPodman.groovy
@@ -49,7 +49,7 @@ def call(Map config=[:]) {
             ]
 
             // 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"
           }
         }