From 7bd62f5c0ab3d816c620b6a7f40bf95b76b5dd23 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Sun, 31 May 2020 12:53:57 -0400
Subject: [PATCH] Fix makefile task names

---
 build/dev-env.sh                | 4 ++--
 build/images/nginx/build.sh     | 2 +-
 build/run-ingress-controller.sh | 2 +-
 test/e2e-image/Makefile         | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/dev-env.sh b/build/dev-env.sh
index 14efe0825..77392506c 100755
--- a/build/dev-env.sh
+++ b/build/dev-env.sh
@@ -57,8 +57,8 @@ if [[ ${KUBE_CLIENT_VERSION} -lt 14 ]]; then
   exit 1
 fi
 
-echo "[dev-env] building container"
-make build container
+echo "[dev-env] building image"
+make build image
 docker tag "${REGISTRY}/nginx-ingress-controller-${ARCH}:${TAG}" "${DEV_IMAGE}"
 
 export K8S_VERSION=${K8S_VERSION:-v1.18.0@sha256:0e20578828edd939d25eb98496a685c76c98d54084932f76069f886ec315d694}
diff --git a/build/images/nginx/build.sh b/build/images/nginx/build.sh
index 19abee8d4..50a034bd4 100644
--- a/build/images/nginx/build.sh
+++ b/build/images/nginx/build.sh
@@ -71,4 +71,4 @@ make init-docker-buildx
 docker buildx use ingress-nginx --default --global
 
 echo "Building NGINX images..."
-make container
+make image
diff --git a/build/run-ingress-controller.sh b/build/run-ingress-controller.sh
index 57292cd71..29338241f 100755
--- a/build/run-ingress-controller.sh
+++ b/build/run-ingress-controller.sh
@@ -76,7 +76,7 @@ if [[ "${USE_EXISTING_IMAGE}" == "true" ]]; then
   docker pull "${IMAGE}-${ARCH}:${TAG}"
 else
   echo -e "${BGREEN}Building ingress controller image${NC}"
-  make -C "${KUBE_ROOT}" build "sub-container-${ARCH}"
+  make -C "${KUBE_ROOT}" build "sub-image-${ARCH}"
 fi
 
 CONTEXT=$(kubectl config current-context)
diff --git a/test/e2e-image/Makefile b/test/e2e-image/Makefile
index 07ac33150..8f6f600e3 100644
--- a/test/e2e-image/Makefile
+++ b/test/e2e-image/Makefile
@@ -1,5 +1,5 @@
 .PHONY: all
-all: container
+all: image
 
 DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 
@@ -12,8 +12,8 @@ ifdef DIND_TASKS
 USE_DOCKER=false
 endif
 
-.PHONY: container
-container:
+.PHONY: image
+image:
 ifeq ($(USE_DOCKER), true)
 	@$(DIR)/../../build/run-in-docker.sh make e2e-test-binary
 else