Merge pull request #2021 from wansir/makefile

update makefile

Makefile

@@ -2,9 +2,6 @@
 # Use of this source code is governed by a Apache license
 # that can be found in the LICENSE file.
 
-# The binary to build 
-BIN ?= ks-apiserver
-
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:trivialVersions=true"
 
@@ -15,8 +12,6 @@ else
 GOBIN=$(shell go env GOBIN)
 endif
 
-
-IMG ?= kubespheredev/ks-apiserver
 OUTPUT_DIR=bin
 GOFLAGS=-mod=vendor
 define ALL_HELP_INFO
@@ -88,7 +83,7 @@ openapi:
 	go run ./tools/cmd/crd-doc-gen/main.go
 # Build the docker image
 docker-build: all
-	docker build . -t ${IMG}
+	hack/docker_build.sh
 
 # Run tests
 test: fmt vet

hack/docker_build.sh

@@ -4,7 +4,7 @@ set -ex
 set -o pipefail
 
 # push to kubespheredev with default latest tag
-REPO=kubespheredev
+REPO=${REPO:-kubespheredev}
 TAG=${TRAVIS_BRANCH:-latest}
 
 # check if build was triggered by a travis cronjob