Update nginx image, use docker buildx and remove qemu (#4923)

* Update nginx image, use docker buildx and remove qemu

* Update e2e image

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:422f554ba9cb291b4402306d77e218dff63ffab4
+FROM quay.io/kubernetes-ingress-controller/nginx-amd64:26f574dc279aa853736d7f7249965e90e47171d6
 
 ARG GOLANG_VERSION
 ARG GOLANG_SHA
@@ -33,7 +33,6 @@ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
 RUN apk add --no-cache \
   bash \
   ca-certificates \
-  parallel \
   wget \
   make \
   gcc \

images/e2e/Makefile

@@ -14,15 +14,15 @@
 
 TAG ?=v$(shell date +%m%d%Y)-$(shell git rev-parse --short HEAD)
 REGISTRY ?= quay.io/kubernetes-ingress-controller
-DOCKER ?= docker
 
 IMAGE = $(REGISTRY)/e2e
 
 all: docker-build docker-push
 
 docker-build:
-	$(DOCKER) build \
+	docker build \
 		--pull \
+		--load \
 		--build-arg K8S_RELEASE=v1.15.7 \
 		--build-arg ETCD_VERSION=v3.3.18 \
 		--build-arg GOLANG_VERSION=1.13.5 \
@@ -32,6 +32,6 @@ docker-build:
 		-t $(IMAGE):$(TAG) .
 
 docker-push:
-	$(DOCKER) push $(IMAGE):$(TAG)
-	$(DOCKER) tag $(IMAGE):$(TAG) $(IMAGE):latest
-	$(DOCKER) push $(IMAGE):latest
+	docker push $(IMAGE):$(TAG)
+	docker tag $(IMAGE):$(TAG) $(IMAGE):latest
+	docker push $(IMAGE):latest