From d12278d9d13d51016295b365d4f97f1d1b8fe059 Mon Sep 17 00:00:00 2001 From: hosingh000 Date: Thu, 31 Jan 2019 15:02:40 -0600 Subject: [PATCH] Update User variable for specific component Change-Id: If43e7d34834d5b657b34172e1418106a85c9ddc3 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0be1a3c6..c6ac9869 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ LABEL ?= commit-id PROXY ?= http://proxy.foo.com:8000 NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local USE_PROXY ?= true -USER := ranger +RANGER_USER := ranger IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} IMAGE_DIR:=images/$(IMAGE_NAME) @@ -57,7 +57,7 @@ build_ranger: ifeq ($(USE_PROXY), true) docker build --network host -t $(IMAGE) --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile \ - --build-arg user=$(USER) \ + --build-arg user=$(RANGER_USER) \ --build-arg http_proxy=$(PROXY) \ --build-arg https_proxy=$(PROXY) \ --build-arg HTTP_PROXY=$(PROXY) \ @@ -65,7 +65,7 @@ ifeq ($(USE_PROXY), true) --build-arg no_proxy=$(NO_PROXY) \ --build-arg NO_PROXY=$(NO_PROXY) . else - docker build --network host -t $(IMAGE) --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile --build-arg user=$(USER) . + docker build --network host -t $(IMAGE) --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile --build-arg user=$(RANGER_USER) . endif .PHONY: build_rangercli