diff --git a/.travis.yml b/.travis.yml index 9ab1d9698b..4089c99966 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,5 +30,4 @@ before_script: script: - make fmt lint vet cover - #- make controllers controllers-images #- make test-e2e diff --git a/Makefile b/Makefile index 5d17f4c18e..6f3e1f5e64 100644 --- a/Makefile +++ b/Makefile @@ -59,10 +59,14 @@ clean: controllers: make -C controllers/nginx build -.PHONY: controllers-images -controllers-images: +.PHONY: docker-build +docker-build: controllers make -C controllers/nginx container +.PHONY: docker-push +docker-push: docker-build + make -C controllers/nginx push + .PHONY: ginkgo ginkgo: go get github.com/onsi/ginkgo/ginkgo diff --git a/hack/e2e.go b/hack/e2e.go index d6ef3fa060..c322d88545 100644 --- a/hack/e2e.go +++ b/hack/e2e.go @@ -57,7 +57,7 @@ func validWorkingDirectory() error { if err != nil { return fmt.Errorf("failed to convert %s to an absolute path: %v", cwd, err) } - if !strings.Contains(filepath.Base(acwd), "ingress-controller") { + if !strings.Contains(filepath.Base(acwd), "ingress") { return fmt.Errorf("must run from git root directory: %v", acwd) } return nil @@ -214,7 +214,7 @@ func run(deploy deployer) error { func Build() error { // The build-release script needs stdin to ask the user whether // it's OK to download the docker image. - cmd := exec.Command("make", "backends", "backends-images", "backends-push") + cmd := exec.Command("make", "docker-build", "docker-push") cmd.Stdin = os.Stdin if err := finishRunning("build-release", cmd); err != nil { return fmt.Errorf("error building: %v", err)