x
/
ranger-agent
Code Issues Proposed changes

Update User variable for specific component 

Change-Id: If58f7264666b0c12679638bbb98224bdd71671af
This commit is contained in:
hosingh000 2019-01-31 14:59:04 -06:00
parent d94bcdb3c2
commit 1733bf23bd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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 ?= false
USER := ranger_agent
RANGER_AGENT_USER := ranger_agent
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
@ -50,7 +50,7 @@ build_$(IMAGE_NAME):
ifeq ($(USE_PROXY), true)
docker build --network host -t $(IMAGE) --label $(LABEL) -f Dockerfile \
--build-arg user=$(USER) \
--build-arg user=$(RANGER_AGENT_USER) \
--build-arg http_proxy=$(PROXY) \
--build-arg https_proxy=$(PROXY) \
--build-arg HTTP_PROXY=$(PROXY) \
@ -58,7 +58,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 Dockerfile --build-arg user=$(USER) .
docker build --network host -t $(IMAGE) --label $(LABEL) -f Dockerfile --build-arg user=$(RANGER_AGENT_USER) .
endif
.PHONY: clean