diff --git a/hack/docker_build.sh b/hack/docker_build.sh index 1bc1114f05534ecd196f1f3189f6cf7586a2eca5..0d0d1ecb2d5bec250791ef3ec464dc6ddbbe4775 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 b082ab498c0726b83e6aec33108317a62694b137..05307409003e835b14254eeccdc508e206d912f9 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}" \