From 3ea2dcb191d8e41498fe062a79349c9d055224c6 Mon Sep 17 00:00:00 2001
From: hosingh000 <hosingh000@gmail.com>
Date: Thu, 17 Jan 2019 13:44:14 -0600
Subject: [PATCH] Changes for past user at the time of Docker image creation

Change-Id: If80d53b5c5c3cc6064378f0ce243d33fe59d74f2
---
 Makefile                 |  4 +++-
 images/ranger/Dockerfile | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 497a14fe..0be1a3c6 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +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
 
 IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
 IMAGE_DIR:=images/$(IMAGE_NAME)
@@ -56,6 +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 http_proxy=$(PROXY) \
 		--build-arg https_proxy=$(PROXY) \
 		--build-arg HTTP_PROXY=$(PROXY) \
@@ -63,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 .
+	docker build --network host -t $(IMAGE) --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile --build-arg user=$(USER) .
 endif
 
 .PHONY: build_rangercli
diff --git a/images/ranger/Dockerfile b/images/ranger/Dockerfile
index f9b5f2fe..838d9bbb 100644
--- a/images/ranger/Dockerfile
+++ b/images/ranger/Dockerfile
@@ -43,19 +43,20 @@ RUN pip install --default-timeout=100 -r requirements.txt
 
 RUN python setup.py install
 
-# Create user ranger
-RUN useradd -u 1000 -ms /bin/bash ranger
+ARG user
+
+# Create user for ranger
+RUN useradd -u 1000 -ms /bin/false ${user:-ranger}
 
 # Change permissions
 RUN  mkdir -p /etc/ranger \
     && mkdir /var/log/ranger \
-    && mkdir -p /opt/app \
-    && mkdir /home/ranger/git_repo \
-    && chown -R ranger: /var/log/ranger \
-    && mv /tmp/ranger /home/ranger/ranger \
-    && chown -R ranger: /home/ranger \
-    && chown -R ranger: /etc/ranger
+   && mkdir /home/${user:-ranger}/git_repo \
+    && chown -R ${user:-ranger}: /var/log/ranger \
+    && mv /tmp/ranger /home/${user:-ranger}/ranger \
+    && chown -R ${user:-ranger}: /home/${user:-ranger} \
+    && chown -R ${user:-ranger}: /etc/ranger
 
 # Set work directory
-USER ranger
-WORKDIR /home/ranger
+USER ${user:-ranger}
+WORKDIR /home/${user:-ranger}