From f97f8a59f9f7b4a8aa62ba3b813d2897b5836669 Mon Sep 17 00:00:00 2001 From: Jeff Date: Mon, 21 Jan 2019 17:37:33 +0800 Subject: [PATCH] change travis.yml --- .travis.yml | 9 +-------- Makefile | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index a542922cc..1b03c2860 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,3 @@ -sudo: required - services: - docker @@ -7,20 +5,15 @@ language: go 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 diff --git a/Makefile b/Makefile index 9f6faa1b6..97c77f6f6 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,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 $(TRAG.Org)/$(TRAG.Name) -f - ./tmp < ./Dockerfile.dev @docker image prune -f 1>/dev/null 2>&1 @echo "build done"