From b55ce73affd510e2c3cd3e497964f6f26778cce8 Mon Sep 17 00:00:00 2001
From: Andrew Rynhard <andrew@andrewrynhard.com>
Date: Sat, 19 May 2018 22:03:31 -0700
Subject: [PATCH] fix(initramfs): build variables (#93)

---
 initramfs/.conform.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/initramfs/.conform.yaml b/initramfs/.conform.yaml
index 18b679391..32d5ddb69 100644
--- a/initramfs/.conform.yaml
+++ b/initramfs/.conform.yaml
@@ -46,7 +46,7 @@ tasks:
       WORKDIR $GOPATH/src/github.com/autonomy/dianemo/initramfs/cmd/init
       {{ if and .Git.IsClean .Git.IsTag }}
       RUN GOOS=linux GOARCH=amd64 go build \
-        -ldflags '-s -w -linkmode external -extldflags "-static -L/usr/lib -lblkid -luuid" -X {{ index .Variables "versionPath" }}.Name=Dianemo -X {{ index .Variables "versionPath" }}.Tag={{ .Docker.Image.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }} -X {{ index .Variables "versionPath" }}.Built={{ .Built }}' \
+        -ldflags '-s -w -linkmode external -extldflags "-static -L/usr/lib -lblkid -luuid" -X {{ index .Variables "versionPath" }}.Name=Dianemo -X {{ index .Variables "versionPath" }}.Tag={{ .Docker.Git.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }} -X {{ index .Variables "versionPath" }}.Built=\"{{ .Built }}\"' \
         -o /initramfs/init
       {{ else }}
       RUN GOOS=linux GOARCH=amd64 go build \
@@ -61,10 +61,10 @@ tasks:
       WORKDIR $GOPATH/src/github.com/autonomy/dianemo/initramfs/cmd/{{ .Docker.CurrentStage }}
       {{ if and .Git.IsClean .Git.IsTag }}
       RUN GOOS=linux GOARCH=amd64 go build -a \
-        -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Client -X {{ index .Variables "versionPath" }}.Tag={{ .Docker.Image.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }} -X {{ index .Variables "versionPath" }}.Built={{ .Built }}" \
+        -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Client -X {{ index .Variables "versionPath" }}.Tag={{ .Docker.Git.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }} -X {{ index .Variables "versionPath" }}.Built=\"{{ .Built }}\"" \
         -o /{{ .Docker.CurrentStage }}-linux-amd64
       RUN GOOS=darwin GOARCH=amd64 go build -a \
-        -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Client -X {{ index .Variables "versionPath" }}.Tag={{ .Docker.Image.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }} -X {{ index .Variables "versionPath" }}.Built={{ .Built }}" \
+        -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Client -X {{ index .Variables "versionPath" }}.Tag={{ .Docker.Git.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }} -X {{ index .Variables "versionPath" }}.Built=\"{{ .Built }}\"" \
         -o /{{ .Docker.CurrentStage }}-darwin-amd64
       {{ else }}
       RUN GOOS=linux GOARCH=amd64 go build -a \
@@ -81,7 +81,7 @@ tasks:
       WORKDIR $GOPATH/src/github.com/autonomy/dianemo/initramfs/cmd/{{ .Docker.CurrentStage }}
       {{ if and .Git.IsClean .Git.IsTag }}
       RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build  -a \
-        -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Server -X {{ index .Variables "versionPath" }}.Tag={{ .Docker.Image.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }} -X {{ index .Variables "versionPath" }}.Built={{ .Built }}" \
+        -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Server -X {{ index .Variables "versionPath" }}.Tag={{ .Docker.Git.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }} -X {{ index .Variables "versionPath" }}.Built=\"{{ .Built }}\"" \
         -o /{{ .Docker.CurrentStage }}
       {{ else }}
       RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a \