From d81e63b5d8651f2f166988d59a669af0622ef886 Mon Sep 17 00:00:00 2001
From: The_Spider <nhyatt@smoothnet.org>
Date: Sun, 30 Jan 2022 14:19:48 -0600
Subject: [PATCH] .

---
 ...ector.jenkinsfile => build-sidecar-injector.jenkins | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename build-sidecar-injector.jenkinsfile => build-sidecar-injector.jenkins (90%)

diff --git a/build-sidecar-injector.jenkinsfile b/build-sidecar-injector.jenkins
similarity index 90%
rename from build-sidecar-injector.jenkinsfile
rename to build-sidecar-injector.jenkins
index 7d972ae..b0f8fe1 100644
--- a/build-sidecar-injector.jenkinsfile
+++ b/build-sidecar-injector.jenkins
@@ -18,14 +18,14 @@ RUN apk add --no-cache git upx && \\
     addgroup -S -g 1000 app && \\
     adduser --disabled-password -G app --gecos "application account" --home "/home/app" --shell "/sbin/nologin" --no-create-home --uid 1000 app && \\
     go mod download && \\
-    GIT_HASH=\$(git rev-parse --short HEAD) && GIT_TAG=\$(git tag | tail -1) && \\
-    CGO_ENABLED=0 && \\
-    GOOS=linux && \\
-    GOARCH=amd64 && \\
+    GIT_HASH="$$(git rev-parse --short HEAD) && GIT_TAG=$$(git tag | tail -1)"" && \\
+    CGO_ENABLED="0" && \\
+    GOOS="linux" && \\
+    GOARCH="amd64" && \\
     go build \\
         -v \\
         -tags timetzdata \\
-        -ldflags="-s -w -X 'github.com/salesforce/generic-sidecar-injector/pkg/metrics.gitHash=\${GIT_HASH}' -X 'github.com/salesforce/generic-sidecar-injector/pkg/metrics.gitTag=\${GIT_TAG}'" \\
+        -ldflags="-s -w -X 'github.com/salesforce/generic-sidecar-injector/pkg/metrics.gitHash=$${GIT_HASH}' -X 'github.com/salesforce/generic-sidecar-injector/pkg/metrics.gitTag=$${GIT_TAG}'" \\
         -installsuffix cgo \\
         -o sidecarinjector \\
         ./cmd/sidecarinjector && \\