x/ranger
Code Issues Proposed changes

Changes for past user at the time of Docker image creation

Browse Source 
Change-Id: If80d53b5c5c3cc6064378f0ce243d33fe59d74f2
This commit is contained in:
hosingh000 2019-01-17 13:44:14 -06:00
parent 2d086fb546
commit 3ea2dcb191
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -21,6 +21,7 @@ LABEL ?= commit-id
PROXY ?= http://proxy.foo.com:8000 PROXY ?= http://proxy.foo.com:8000
NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
USE_PROXY ?= true USE_PROXY ?= true
USER := ranger
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
IMAGE_DIR:=images/$(IMAGE_NAME) IMAGE_DIR:=images/$(IMAGE_NAME)
@ -56,6 +57,7 @@ build_ranger:
ifeq ($(USE_PROXY), true) ifeq ($(USE_PROXY), true)
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) \
--build-arg http_proxy=$(PROXY) \ --build-arg http_proxy=$(PROXY) \
--build-arg https_proxy=$(PROXY) \ --build-arg https_proxy=$(PROXY) \
--build-arg HTTP_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) \
--build-arg NO_PROXY=$(NO_PROXY) . --build-arg NO_PROXY=$(NO_PROXY) .
else 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 endif
.PHONY: build_rangercli .PHONY: build_rangercli

21
images/ranger/Dockerfile
View File

@ -43,19 +43,20 @@ RUN pip install --default-timeout=100 -r requirements.txt
RUN python setup.py install RUN python setup.py install
# Create user ranger ARG user
RUN useradd -u 1000 -ms /bin/bash ranger
# Create user for ranger
RUN useradd -u 1000 -ms /bin/false ${user:-ranger}
# Change permissions # Change permissions
RUN mkdir -p /etc/ranger \ RUN mkdir -p /etc/ranger \
&& mkdir /var/log/ranger \ && mkdir /var/log/ranger \
&& mkdir -p /opt/app \ && mkdir /home/${user:-ranger}/git_repo \
&& mkdir /home/ranger/git_repo \ && chown -R ${user:-ranger}: /var/log/ranger \
&& chown -R ranger: /var/log/ranger \ && mv /tmp/ranger /home/${user:-ranger}/ranger \
&& mv /tmp/ranger /home/ranger/ranger \ && chown -R ${user:-ranger}: /home/${user:-ranger} \
&& chown -R ranger: /home/ranger \ && chown -R ${user:-ranger}: /etc/ranger
&& chown -R ranger: /etc/ranger
# Set work directory # Set work directory
USER ranger USER ${user:-ranger}
WORKDIR /home/ranger WORKDIR /home/${user:-ranger}