diff --git a/Makefile b/Makefile index e4f3f0b19..af588d6f9 100644 --- a/Makefile +++ b/Makefile @@ -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.58 +BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.59 ifeq ($(ARCH),arm) QEMUARCH=arm diff --git a/build/go-in-docker.sh b/build/go-in-docker.sh index 162dbd29c..50db9a368 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:v08152018-56ed290 +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v08172018-4c33df1 DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile index 65e9a2120..70d9f1e97 100644 --- a/images/e2e/Dockerfile +++ b/images/e2e/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.57 +FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.59 RUN clean-install \ g++ \ @@ -22,6 +22,7 @@ RUN clean-install \ make \ wget \ luarocks \ + python \ pkg-config ENV GOLANG_VERSION 1.10.3