From 20ac6037478bc67b53e5921ee05d0777c734fc21 Mon Sep 17 00:00:00 2001 From: Ashish Amarnath Date: Fri, 21 Aug 2020 14:14:29 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20passing=20LDFLAGS=20across?= =?UTF-8?q?=20build=20stages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ashish Amarnath --- Dockerfile | 4 +--- changelogs/unreleased/2853-ashish-amarnath | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/2853-ashish-amarnath diff --git a/Dockerfile b/Dockerfile index d80b78361..7c77e67b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,9 +22,7 @@ ARG GIT_TREE_STATE ENV CGO_ENABLED=0 \ GO111MODULE=on \ GOPROXY=${GOPROXY} \ - LDFLAGS="-X ${PKG}/pkg/buildinfo.Version=${VERSION}" \ - LDFLAGS="${LDFLAGS} -X ${PKG}/pkg/buildinfo.GitSHA=${GIT_SHA}" \ - LDFLAGS="${LDFLAGS} -X ${PKG}/pkg/buildinfo.GitTreeState=${GIT_TREE_STATE}" + LDFLAGS="-X ${PKG}/pkg/buildinfo.Version=${VERSION} -X ${PKG}/pkg/buildinfo.GitSHA=${GIT_SHA} -X ${PKG}/pkg/buildinfo.GitTreeState=${GIT_TREE_STATE}" WORKDIR /go/src/github.com/vmware-tanzu/velero diff --git a/changelogs/unreleased/2853-ashish-amarnath b/changelogs/unreleased/2853-ashish-amarnath new file mode 100644 index 000000000..45b160cde --- /dev/null +++ b/changelogs/unreleased/2853-ashish-amarnath @@ -0,0 +1 @@ +🐛 fix passing LDFLAGS across build stages