From 068017a44c326ef9f04d7dc80809292d585c7ca7 Mon Sep 17 00:00:00 2001 From: Andrew Rynhard Date: Sat, 19 May 2018 22:54:54 -0700 Subject: [PATCH] fix(initramfs): quote -X flag (#95) --- initramfs/.conform.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/initramfs/.conform.yaml b/initramfs/.conform.yaml index a9618a16a..cc5721c68 100644 --- a/initramfs/.conform.yaml +++ b/initramfs/.conform.yaml @@ -46,11 +46,11 @@ 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={{ .Git.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={{ .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 \ - -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 }}' \ + -ldflags "-s -w -linkmode external -extldflags "-static -L/usr/lib -lblkid -luuid" -X {{ index .Variables "versionPath" }}.Name=Dianemo -X {{ index .Variables "versionPath" }}.Tag=none -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }}" \ -o /initramfs/init {{ end }} RUN chmod +x /initramfs/init @@ -61,17 +61,17 @@ 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={{ .Git.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={{ .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={{ .Git.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={{ .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 \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Client -X {{ index .Variables "versionPath" }}.Tag={{ .Docker.Image.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }}" \ + -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Client -X {{ index .Variables "versionPath" }}.Tag=none -X {{ index .Variables "versionPath" }}.SH={{ .Git.SHA }}" \ -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 }}" \ + -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Client -X {{ index .Variables "versionPath" }}.Tag=none -X {{ index .Variables "versionPath" }}.SH={{ .Git.SHA }}" \ -o /{{ .Docker.CurrentStage }}-darwin-amd64 {{ end }} RUN chmod +x /{{ .Docker.CurrentStage }}-linux-amd64 @@ -81,11 +81,11 @@ 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={{ .Git.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={{ .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 \ - -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Server -X {{ index .Variables "versionPath" }}.Tag={{ .Docker.Image.Tag }} -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }}" \ + -ldflags "-s -w -X {{ index .Variables "versionPath" }}.Name=Server -X {{ index .Variables "versionPath" }}.Tag=none -X {{ index .Variables "versionPath" }}.SHA={{ .Git.SHA }}" \ -o /{{ .Docker.CurrentStage }} {{ end }} RUN chmod +x /{{ .Docker.CurrentStage }} @@ -112,6 +112,7 @@ tasks: RUN protoc -I/usr/local/include -I./proto --go_out=plugins=grpc:proto proto/api.proto src: template: | + FROM dianemo/tools:{{ .Docker.Image.Tag }} AS {{ .Docker.CurrentStage }} RUN ln -s /tools/lib64 /lib64 RUN mkdir /tmp