fix(build): fix release tag env in buildscript

RELEASE_TAG is now passed as a build argument to the buildx container, so that build script can set the ldflags correctly. Signed-off-by: Akhil Mohan <[email protected]>
openebs-archive · Nov 13, 2020 · 59f7908 · 59f7908
1 parent c404c25
commit 59f7908
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -90,8 +90,7 @@ ifeq (${DBUILD_SITE_URL}, )
   export DBUILD_SITE_URL
 endif
 
-export DBUILD_ARGS=--build-arg DBUILD_DATE=${DBUILD_DATE} --build-arg DBUILD_REPO_URL=${DBUILD_REPO_URL} --build-arg DBUILD_SITE_URL=${DBUILD_SITE_URL} --build-arg ARCH=${ARCH}
-
+export DBUILD_ARGS=--build-arg DBUILD_DATE=${DBUILD_DATE} --build-arg DBUILD_REPO_URL=${DBUILD_REPO_URL} --build-arg DBUILD_SITE_URL=${DBUILD_SITE_URL} --build-arg RELEASE_TAG=${RELEASE_TAG}
 
 # Initialize the NDM DaemonSet variables
 # Specify the NDM DaemonSet binary name

diff --git a/Makefile.buildx.mk b/Makefile.buildx.mk
@@ -15,8 +15,6 @@
 # ==============================================================================
 # Build Options
 
-export DBUILD_ARGS=--build-arg DBUILD_DATE=${DBUILD_DATE} --build-arg DBUILD_REPO_URL=${DBUILD_REPO_URL} --build-arg DBUILD_SITE_URL=${DBUILD_SITE_URL}
-
 ifeq (${TAG}, )
   export TAG=ci
 endif

diff --git a/build/ndm-daemonset/Dockerfile b/build/ndm-daemonset/Dockerfile
@@ -26,7 +26,8 @@ ENV GO111MODULE=on \
   GOARCH=${TARGETARCH} \
   GOARM=${TARGETVARIANT} \
   DEBIAN_FRONTEND=noninteractive \
-  PATH="/root/go/bin:${PATH}"
+  PATH="/root/go/bin:${PATH}" \
+  RELEASE_TAG=${RELEASE_TAG}
 
 WORKDIR /go/src/github.com/openebs/node-disk-manager/
 

diff --git a/build/ndm-exporter/Dockerfile b/build/ndm-exporter/Dockerfile
@@ -26,7 +26,8 @@ ENV GO111MODULE=on \
   GOARCH=${TARGETARCH} \
   GOARM=${TARGETVARIANT} \
   DEBIAN_FRONTEND=noninteractive \
-  PATH="/root/go/bin:${PATH}"
+  PATH="/root/go/bin:${PATH}" \
+  RELEASE_TAG=${RELEASE_TAG}
 
 WORKDIR /go/src/github.com/openebs/node-disk-manager/
 

diff --git a/build/ndm-operator/Dockerfile b/build/ndm-operator/Dockerfile
@@ -26,7 +26,8 @@ ENV GO111MODULE=on \
   GOARCH=${TARGETARCH} \
   GOARM=${TARGETVARIANT} \
   DEBIAN_FRONTEND=noninteractive \
-  PATH="/root/go/bin:${PATH}"
+  PATH="/root/go/bin:${PATH}" \
+  RELEASE_TAG=${RELEASE_TAG}
 
 WORKDIR /go/src/github.com/openebs/node-disk-manager/