From 08df4c6200eec72b200b46df9e67a6bd753ae1a7 Mon Sep 17 00:00:00 2001
From: hosingh000 <hosingh000@gmail.com>
Date: Fri, 16 Feb 2018 12:07:00 -0600
Subject: [PATCH] fix git repo and ssh key issue

Change-Id: I2dd09463a2cddbf62a2b4f8627af7e29d4ea6e8e
---
 Dockerfile            | 16 +++++++++-------
 ord/client/getrepo.py |  1 +
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 82d4bea..1851e47 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,6 +12,7 @@ apt -y install git \
 netcat \
 netbase \
 curl \
+openssh-server \
 python-minimal \
 python-setuptools \
 python-pip \
@@ -45,17 +46,18 @@ RUN pip install --default-timeout=100 -r requirements.txt
 RUN python setup.py install
 
 RUN cd ~/ \
+    && rm /etc/ord/* \
     && rm -fr /tmp/ranger-agent \
     && mkdir /var/log/ranger-agent
 
-# Create user aic-ord
-RUN useradd -ms /bin/bash aic-ord
+# Create user ranger_agent
+RUN useradd -u 1000 -ms /bin/bash ranger_agent 
 
 # Change permissions
-RUN chown -R aic-ord: /home/aic-ord \
-    && chown -R aic-ord: /etc/ord \
-    && chown -R aic-ord: /var/log/ranger-agent
+RUN chown -R ranger_agent: /home/ranger_agent \
+    && chown -R ranger_agent: /etc/ord \
+    && chown -R ranger_agent: /var/log/ranger-agent
 
 # Set work directory
-USER aic-ord
-WORKDIR /home/aic-ord/
+USER ranger_agent
+WORKDIR /home/ranger_agent/
diff --git a/ord/client/getrepo.py b/ord/client/getrepo.py
index bf4e1a5..365eaf0 100755
--- a/ord/client/getrepo.py
+++ b/ord/client/getrepo.py
@@ -38,6 +38,7 @@ ORM_OPTS = [
 
 cfg.CONF.register_opts(ORM_OPTS, group='orm')
 LOG = logging.getLogger(__name__)
+subprocess._has_poll = False
 
 
 class TemplateRepoClient(object):