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

Merge pull request #2565 from aledbf/update-nginx

Browse source 
Update nginx version
This commit is contained in:
k8s-ci-robot 2018-05-24 21:40:33 -07:00 committed by GitHub
commit a5958c06b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -44,7 +44,7 @@ DUMB_ARCH = ${ARCH}
ALL_ARCH = amd64 arm arm64 ppc64le s390x ALL_ARCH = amd64 arm arm64 ppc64le s390x
QEMUVERSION=v2.9.1-1 QEMUVERSION=v2.12.0
BUSTED_ARGS=-v --pattern=_test BUSTED_ARGS=-v --pattern=_test
@ -53,7 +53,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH) MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
# Set default base image dynamically for each arch # Set default base image dynamically for each arch
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.46 BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.48
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
QEMUARCH=arm QEMUARCH=arm