Merge pull request #40393 from thaJeztah/fix_autogen_spaces

hack/make/.go-autogen: fix LDFLAGS to accept values with spaces
This commit is contained in:
Brian Goff 2020-01-17 17:31:35 -08:00 committed by GitHub
commit 45a38feb01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -7,14 +7,14 @@ source hack/dockerfile/install/tini.installer
source hack/dockerfile/install/containerd.installer
LDFLAGS="${LDFLAGS} \
-X github.com/docker/docker/dockerversion.Version=${VERSION} \
-X github.com/docker/docker/dockerversion.GitCommit=${GITCOMMIT} \
-X github.com/docker/docker/dockerversion.BuildTime=${BUILDTIME} \
-X github.com/docker/docker/dockerversion.IAmStatic=${IAMSTATIC:-true} \
-X github.com/docker/docker/dockerversion.PlatformName=${PLATFORM} \
-X github.com/docker/docker/dockerversion.ProductName=${PRODUCT} \
-X github.com/docker/docker/dockerversion.DefaultProductLicense=${DEFAULT_PRODUCT_LICENSE} \
-X github.com/docker/docker/dockerversion.InitCommitID=${TINI_COMMIT} \
-X \"github.com/docker/docker/dockerversion.Version=${VERSION}\" \
-X \"github.com/docker/docker/dockerversion.GitCommit=${GITCOMMIT}\" \
-X \"github.com/docker/docker/dockerversion.BuildTime=${BUILDTIME}\" \
-X \"github.com/docker/docker/dockerversion.IAmStatic=${IAMSTATIC:-true}\" \
-X \"github.com/docker/docker/dockerversion.PlatformName=${PLATFORM}\" \
-X \"github.com/docker/docker/dockerversion.ProductName=${PRODUCT}\" \
-X \"github.com/docker/docker/dockerversion.DefaultProductLicense=${DEFAULT_PRODUCT_LICENSE}\" \
-X \"github.com/docker/docker/dockerversion.InitCommitID=${TINI_COMMIT}\" \
"
# Compile the Windows resources into the sources