Merge pull request #2032 from wansir/update-makefile

update makefile

Makefile

@@ -10,9 +10,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# The binary to build 
-BIN ?= ks-apiserver
-
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:trivialVersions=true"
 
@@ -23,8 +20,6 @@ else
 GOBIN=$(shell go env GOBIN)
 endif
 
-
-IMG ?= kubespheredev/ks-apiserver
 OUTPUT_DIR=bin
 GOFLAGS=-mod=vendor
 define ALL_HELP_INFO
@@ -102,7 +97,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,9 +4,9 @@ set -ex
 set -o pipefail
 
 # Default image repo
-REPO=kubespheredev
+REPO=${REPO:-kubespheredev}
 # Set tag to latest if no argument was given, normally was branch name
-TAG=${1:-latest}
+TAG=${TAG:-latest}
 
 docker build -f build/ks-apigateway/Dockerfile -t $REPO/ks-apigateway:$TAG .
 docker build -f build/ks-apiserver/Dockerfile -t $REPO/ks-apiserver:$TAG .
@@ -15,6 +15,7 @@ docker build -f build/ks-controller-manager/Dockerfile -t $REPO/ks-controller-ma
 docker build -f build/hypersphere/Dockerfile -t $REPO/hypersphere:$TAG .
 docker build -f ./pkg/db/Dockerfile -t $REPO/ks-devops:flyway-$TAG ./pkg/db/
 
+
 # Push image to dockerhub, need to support multiple push
 
 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin