From 3de8b48a80d15924436f759283ec5c58bf29c118 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Wed, 10 Oct 2018 10:14:07 -0300
Subject: [PATCH] Update nginx image

---
 Makefile                     |  4 ++--
 build/go-in-docker.sh        |  3 +--
 images/nginx/rootfs/build.sh | 12 ++++++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 4e9c766cc..36d67c0c1 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ DUMB_ARCH = ${ARCH}
 
 GOBUILD_FLAGS :=
 
-ALL_ARCH = amd64 arm arm64 ppc64le s390x
+ALL_ARCH = amd64 arm arm64 ppc64le
 
 QEMUVERSION = v2.12.0-1
 
@@ -61,7 +61,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
 
 # Set default base image dynamically for each arch
-BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.64
+BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.65
 
 ifeq ($(ARCH),arm)
 	QEMUARCH=arm
diff --git a/build/go-in-docker.sh b/build/go-in-docker.sh
index 812c6d6b8..2ed3df341 100755
--- a/build/go-in-docker.sh
+++ b/build/go-in-docker.sh
@@ -40,7 +40,7 @@ if [ "$missing" = true ];then
   exit 1
 fi
 
-E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v10042018-c8abff1
+E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v10102018-dcc6495
 
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
@@ -69,7 +69,6 @@ docker run                                       \
     --rm                                         \
     ${DOCKER_OPTS}                               \
     -v ${HOME}/.kube:/${HOME}/.kube              \
-    -v ${HOME}/.minikube:${HOME}/.minikube       \
     -v ${PWD}:/go/src/${PKG}                     \
     -v ${PWD}/.gocache:${HOME}/.cache/go-build   \
     -v ${PWD}/bin/${ARCH}:/go/bin/linux_${ARCH}  \
diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh
index c7aeff5a4..b459c15d9 100755
--- a/images/nginx/rootfs/build.sh
+++ b/images/nginx/rootfs/build.sh
@@ -236,6 +236,18 @@ else
 fi
 
 # Installing luarocks packages
+if [[ ${ARCH} == "armv7l" ]]; then
+  export PCRE_DIR=/usr/lib/armhf-linux-gnu
+fi
+
+if [[ ${ARCH} == "aarch64" ]]; then
+  export PCRE_DIR=/usr/lib/aarch64-linux-gnu
+fi
+
+if [[ ${ARCH} == "ppc64le" ]]; then
+  export PCRE_DIR=/usr/lib/powerpc64le-linux-gnu
+fi
+
 luarocks install lrexlib-pcre 2.7.2-1
 
 cd "$BUILD_PATH/lua-resty-core-0.1.15"