DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix makefile task names

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-05-31 12:53:57 -04:00
parent d250b97b43
commit 7bd62f5c0a
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/dev-env.sh
View file

@ -57,8 +57,8 @@ if [[ ${KUBE_CLIENT_VERSION} -lt 14 ]]; then
exit 1 exit 1
fi fi
echo "[dev-env] building container" echo "[dev-env] building image"
make build container make build image
docker tag "${REGISTRY}/nginx-ingress-controller-${ARCH}:${TAG}" "${DEV_IMAGE}" docker tag "${REGISTRY}/nginx-ingress-controller-${ARCH}:${TAG}" "${DEV_IMAGE}"
export K8S_VERSION=${K8S_VERSION:-v1.18.0@sha256:0e20578828edd939d25eb98496a685c76c98d54084932f76069f886ec315d694} export K8S_VERSION=${K8S_VERSION:-v1.18.0@sha256:0e20578828edd939d25eb98496a685c76c98d54084932f76069f886ec315d694}

2
build/images/nginx/build.sh
View file

@ -71,4 +71,4 @@ make init-docker-buildx
docker buildx use ingress-nginx --default --global docker buildx use ingress-nginx --default --global
echo "Building NGINX images..." echo "Building NGINX images..."
make container make image

2
build/run-ingress-controller.sh
View file

@ -76,7 +76,7 @@ if [[ "${USE_EXISTING_IMAGE}" == "true" ]]; then
docker pull "${IMAGE}-${ARCH}:${TAG}" docker pull "${IMAGE}-${ARCH}:${TAG}"
else else
echo -e "${BGREEN}Building ingress controller image${NC}" 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 fi
CONTEXT=$(kubectl config current-context) CONTEXT=$(kubectl config current-context)

6
test/e2e-image/Makefile
View file

@ -1,5 +1,5 @@
.PHONY: all .PHONY: all
all: container all: image
DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
@ -12,8 +12,8 @@ ifdef DIND_TASKS
USE_DOCKER=false USE_DOCKER=false
endif endif
.PHONY: container .PHONY: image
container: image:
ifeq ($(USE_DOCKER), true) ifeq ($(USE_DOCKER), true)
@$(DIR)/../../build/run-in-docker.sh make e2e-test-binary @$(DIR)/../../build/run-in-docker.sh make e2e-test-binary
else else