DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #929 from aledbf/master

Browse source 
Add release task in Makefiles and avoid multiple builds
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-06-30 16:22:03 -04:00 committed by GitHub
commit 24d78cae8e
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -67,6 +67,10 @@ docker-build:
docker-push: docker-push:
make -C controllers/nginx all-push make -C controllers/nginx all-push
.PHONE: release
release:
make -C controllers/nginx release
.PHONY: ginkgo .PHONY: ginkgo
ginkgo: ginkgo:
go get github.com/onsi/ginkgo/ginkgo go get github.com/onsi/ginkgo/ginkgo

5
controllers/nginx/Makefile
View file

@ -88,7 +88,7 @@ ifeq ($(ARCH), amd64)
endif endif
push: .push-$(ARCH) push: .push-$(ARCH)
.push-$(ARCH): .container-$(ARCH) .push-$(ARCH):
$(DOCKER) push $(MULTI_ARCH_IMG):$(TAG) $(DOCKER) push $(MULTI_ARCH_IMG):$(TAG)
ifeq ($(ARCH), amd64) ifeq ($(ARCH), amd64)
$(DOCKER) push $(IMAGE):$(TAG) $(DOCKER) push $(IMAGE):$(TAG)
@ -123,3 +123,6 @@ cover:
vet: vet:
@echo "+ $@" @echo "+ $@"
@go vet $(shell go list ${PKG}/... | grep -v vendor) @go vet $(shell go list ${PKG}/... | grep -v vendor)
release: all-container all-push
echo "done"