From 071ac585647839dfaadcdb829e9ec47c740728f4 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Tue, 14 Mar 2017 14:49:21 -0700 Subject: [PATCH] Fix a few bugs in the nginx-ingress-controller Makefile * make 'clean' use the new path to the built binary * make 'container' depend on 'build' --- controllers/nginx/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/nginx/Makefile b/controllers/nginx/Makefile index ac1300eb4d..0587605828 100644 --- a/controllers/nginx/Makefile +++ b/controllers/nginx/Makefile @@ -21,7 +21,7 @@ build: clean -ldflags "-s -w -X ${PKG}/pkg/version.RELEASE=${RELEASE} -X ${PKG}/pkg/version.COMMIT=${COMMIT} -X ${PKG}/pkg/version.REPO=${REPO_INFO}" \ -o rootfs/nginx-ingress-controller ${PKG}/pkg/cmd/controller -container: +container: build $(DOCKER) build --pull -t $(PREFIX):$(RELEASE) rootfs push: container @@ -50,4 +50,4 @@ vet: @go vet $(shell go list ${PKG}/... | grep -v vendor) clean: - rm -f nginx-ingress-controller + rm -f rootfs/nginx-ingress-controller