From 53c32049021b5306b62c953d2a03b81edab741a3 Mon Sep 17 00:00:00 2001
From: rick <rick@jenkins-zh.cn>
Date: Mon, 30 Nov 2020 14:38:15 +0800
Subject: [PATCH] Allow users to specific goos via env variable

Signed-off-by: rick <rick@jenkins-zh.cn>
---
 hack/docker_build.sh | 11 ++++++++---
 hack/gobuild.sh      |  6 ++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/hack/docker_build.sh b/hack/docker_build.sh
index 1bc1114f0..0d0d1ecb2 100755
--- a/hack/docker_build.sh
+++ b/hack/docker_build.sh
@@ -20,13 +20,18 @@ tag_for_branch() {
 REPO=${REPO:-kubespheredev}
 TAG=$(tag_for_branch $1)
 
-docker build -f build/ks-apiserver/Dockerfile -t $REPO/ks-apiserver:$TAG .
-docker build -f build/ks-controller-manager/Dockerfile -t $REPO/ks-controller-manager:$TAG .
-
 # Push image to dockerhub, need to support multiple push
 cat ~/.docker/config.json | grep index.docker.io
 if [[ $? != 0 ]]; then
   echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 fi
+
+docker build -f build/ks-apiserver/Dockerfile -t $REPO/ks-apiserver:$TAG .
 docker push $REPO/ks-apiserver:$TAG
+# print the full docker image path for your convience
+docker images --digests | grep $REPO/ks-apiserver | grep $TAG | awk '{print $1":"$2"@"$3}'
+
+docker build -f build/ks-controller-manager/Dockerfile -t $REPO/ks-controller-manager:$TAG .
 docker push $REPO/ks-controller-manager:$TAG
+# print the full docker image path for your convience
+docker images --digests | grep $REPO/ks-controller-manager | grep $TAG | awk '{print $1":"$2"@"$3}'
diff --git a/hack/gobuild.sh b/hack/gobuild.sh
index b082ab498..053074090 100755
--- a/hack/gobuild.sh
+++ b/hack/gobuild.sh
@@ -41,6 +41,12 @@ BUILD_GOARCH=${GOARCH:-$(go env GOARCH)}
 GOBINARY=${GOBINARY:-go}
 LDFLAGS=$(kube::version::ldflags)
 
+# we need to build a particular binary instead of default one in some cases
+KS_BUILD_GOOS=${KS_BUILD_GOOS:-""}
+if [[ "${KS_BUILD_GOOS}" != "" ]]; then
+  BUILD_GOOS=${KS_BUILD_GOOS}
+fi
+
 # forgoing -i (incremental build) because it will be deprecated by tool chain.
 time GOOS=${BUILD_GOOS} CGO_ENABLED=0 GOARCH=${BUILD_GOARCH} ${GOBINARY} build \
         -ldflags="${LDFLAGS}" \