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

Merge pull request #2942 from aledbf/update-image

Browse source 
Update nginx image
This commit is contained in:
k8s-ci-robot 2018-08-14 21:12:51 -07:00 committed by GitHub
commit cb96cf0fcc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -52,7 +52,7 @@ GOBUILD_FLAGS :=
ALL_ARCH = amd64 arm arm64 ppc64le s390x ALL_ARCH = amd64 arm arm64 ppc64le s390x
QEMUVERSION = v2.12.0 QEMUVERSION = v2.12.0-1
BUSTED_ARGS =-v --pattern=_test BUSTED_ARGS =-v --pattern=_test
@ -61,7 +61,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.57 BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.58
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
QEMUARCH=arm QEMUARCH=arm

2
build/go-in-docker.sh
View file

@ -40,7 +40,7 @@ if [ "$missing" = true ];then
exit 1 exit 1
fi fi
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v08042018-e2f5d90 E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v08152018-56ed290
DOCKER_OPTS=${DOCKER_OPTS:-""} DOCKER_OPTS=${DOCKER_OPTS:-""}

2
images/custom-error-pages/Makefile
View file

@ -30,7 +30,7 @@ BASEIMAGE?=alpine:3.7
ALL_ARCH = amd64 arm arm64 ppc64le ALL_ARCH = amd64 arm arm64 ppc64le
QEMUVERSION=v2.12.0 QEMUVERSION=v2.12.0-1
IMGNAME = custom-error-pages IMGNAME = custom-error-pages
IMAGE = $(REGISTRY)/$(IMGNAME) IMAGE = $(REGISTRY)/$(IMGNAME)

2
images/nginx/Makefile
View file

@ -26,7 +26,7 @@ ifeq ($(GOHOSTOS),darwin)
SED_I=sed -i '' SED_I=sed -i ''
endif endif
QEMUVERSION=v2.12.0 QEMUVERSION=v2.12.0-1
IMGNAME = nginx IMGNAME = nginx
IMAGE = $(REGISTRY)/$(IMGNAME) IMAGE = $(REGISTRY)/$(IMGNAME)