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

Test trigger of cloudbuild for nginx image

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-06-25 14:03:34 -04:00
parent cbd93f43ac
commit 330e2aedd4
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
images/nginx/Makefile
View file

@ -15,12 +15,13 @@
.DEFAULT_GOAL:=build .DEFAULT_GOAL:=build
# set default shell # set default shell
SHELL=/bin/bash SHELL=/bin/bash -o pipefail -o errexit
DIR:=$(strip $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))) DIR:=$(strip $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
INIT_BUILDX=$(DIR)/../../hack/init-buildx.sh
# 0.0.0 shouldn't clobber any released builds # 0.0.0 shouldn't clobber any released builds
TAG ?= 0.106 TAG ?= 0.105
REGISTRY ?= quay.io/kubernetes-ingress-controller REGISTRY ?= quay.io/kubernetes-ingress-controller
IMAGE = $(REGISTRY)/nginx IMAGE = $(REGISTRY)/nginx
@ -45,6 +46,12 @@ push: build
# enable buildx # enable buildx
ensure-buildx: ensure-buildx:
$(DIR)/../../hack/init-buildx.sh # this is required for cloudbuild
ifeq ("$(wildcard $(INIT_BUILDX))","")
@curl -sSL https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/hack/init-buildx.sh | bash
else
@exec $(INIT_BUILDX)
endif
@echo "done"
.PHONY: build push ensure-buildx .PHONY: build push ensure-buildx

2
images/nginx/cloudbuild.yaml
View file

@ -16,8 +16,6 @@ steps:
- -c - -c
- | - |
gcloud auth configure-docker \ gcloud auth configure-docker \
&& pwd \
&& ls -lat \
&& make build push && make build push
substitutions: substitutions:
_GIT_TAG: "12345" _GIT_TAG: "12345"