diff --git a/Makefile b/Makefile index b1bb7735f..e062d482e 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ DUMB_ARCH = ${ARCH} GOBUILD_FLAGS := -ALL_ARCH = amd64 arm arm64 ppc64le +ALL_ARCH = amd64 arm64 QEMUVERSION = v3.0.0 @@ -61,24 +61,11 @@ 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.71 +BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.72 -ifeq ($(ARCH),arm) - QEMUARCH=arm - GOARCH=arm - DUMB_ARCH=armhf -endif ifeq ($(ARCH),arm64) QEMUARCH=aarch64 endif -ifeq ($(ARCH),ppc64le) - QEMUARCH=ppc64le - GOARCH=ppc64le - DUMB_ARCH=ppc64el -endif -ifeq ($(ARCH),s390x) - QEMUARCH=s390x -endif TEMP_DIR := $(shell mktemp -d) diff --git a/build/go-in-docker.sh b/build/go-in-docker.sh index 2ae564685..b8524daa8 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:v11162018-ef7143f5a +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v12062018-cc2b54472 DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile index 8dac6f972..76e7e0954 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.70 +FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.72 RUN clean-install \ g++ \