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

Merge pull request #926 from aledbf/fix-docker-push

Browse source 
Fix docker-push task to publish arm and ppc64le
This commit is contained in:
Nick Sardo 2017-06-29 21:59:21 -07:00 committed by GitHub
commit e119059c96
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -65,7 +65,7 @@ docker-build:
.PHONY: docker-push .PHONY: docker-push
docker-push: docker-push:
make -C controllers/nginx push make -C controllers/nginx all-push
.PHONY: ginkgo .PHONY: ginkgo
ginkgo: ginkgo:

2
controllers/nginx/Makefile
View file

@ -100,7 +100,7 @@ clean:
build: clean build: clean
CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} go build -a -installsuffix cgo \ CGO_ENABLED=0 GOOS=${GOOS} GOARCH=${GOARCH} go build -a -installsuffix cgo \
-ldflags "-s -w -X ${PKG}/pkg/version.RELEASE=${TAG} -X ${PKG}/pkg/version.COMMIT=${COMMIT} -X ${PKG}/pkg/version.REPO=${REPO_INFO}" \ -ldflags "-s -w -X ${PKG}/pkg/version.RELEASE=${TAG} -X ${PKG}/pkg/version.COMMIT=${COMMIT} -X ${PKG}/pkg/version.REPO=${REPO_INFO}" \
-o $(TEMP_DIR)/rootfs/nginx-ingress-controller ${PKG}/pkg/cmd/controller -o ${TEMP_DIR}/rootfs/nginx-ingress-controller ${PKG}/pkg/cmd/controller
fmt: fmt:
@echo "+ $@" @echo "+ $@"