From da8ffc94744185b2ae50442c0848f8b78d7de7e5 Mon Sep 17 00:00:00 2001
From: Jeff <jeffzhang@yunify.com>
Date: Mon, 21 Jan 2019 17:37:33 +0800
Subject: [PATCH] change registry address

---
 .travis.yml | 13 +++++--------
 Makefile    |  7 ++++++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a542922cc..3d1b48206 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,28 @@
-sudo: required
-
 services:
   - docker
 
 language: go
 
+git:
+  depth: false
+
 go:
   - 1.10
-  - tip
 
 go_import_path: kubesphere.io/kubesphere
 
 before_install:
-  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
   - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-  - sudo apt-get update
-  - sudo apt-get -y install docker-ce
-  - dep ensure -v
 
 before_script:
   - docker --version
+  - dep ensure -v
 
 script:
   - make fmt-check && make build
 
 deploy:
+  skip_cleanup: true
   provider: script
   script: bash install/scripts/docker_push
   on:
diff --git a/Makefile b/Makefile
index 9f6faa1b6..65793c7aa 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@
 # Use of this source code is governed by a Apache license
 # that can be found in the LICENSE file.
 
+# The binary to build 
+BIN ?= kubesphere
+
 TRAG.Org:=kubesphere
 TRAG.Name:=ks-apiserver
 TRAG.Gopkg:=kubesphere.io/kubesphere
@@ -12,6 +15,8 @@ RUN_IN_DOCKER:=docker run -it --rm -v `pwd`:/go/src/$(TRAG.Gopkg) -v `pwd`/tmp/c
 GO_FMT:=goimports -l -w -e -local=kubesphere -srcdir=/go/src/$(TRAG.Gopkg)
 GO_FILES:=./cmd ./pkg
 
+REGISTRY ?= kubespheredev/ks-apiserver
+
 define get_diff_files
     $(eval DIFF_FILES=$(shell git diff --name-only --diff-filter=ad | grep -E "^(test|cmd|pkg)/.+\.go"))
 endef
@@ -92,7 +97,7 @@ build: fmt
 	$(call get_build_flags)
 	$(RUN_IN_DOCKER) time go install -ldflags '$(BUILD_FLAG)' $(TRAG.Gopkg)/cmd/...
 	mv ./tmp/bin/cmd ./tmp/bin/$(TRAG.Name)
-	@docker build -t $(TRAG.Org)/$(TRAG.Name) -f ./Dockerfile.dev ./tmp
+	@docker build -t ${REGISTRY}/$(TRAG.Name) -f - ./tmp < ./Dockerfile.dev 
 	@docker image prune -f 1>/dev/null 2>&1
 	@echo "build done"