x/ranger-agent
Code Issues Proposed changes

Merge "fix git repo and ssh key issue"

Browse Source
This commit is contained in:
Zuul 2018-02-16 18:50:17 +00:00 committed by Gerrit Code Review
commit 63633a04aa
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Dockerfile
View File

@ -12,6 +12,7 @@ apt -y install git \
netcat \ netcat \
netbase \ netbase \
curl \ curl \
openssh-server \
python-minimal \ python-minimal \
python-setuptools \ python-setuptools \
python-pip \ python-pip \
@ -45,17 +46,18 @@ RUN pip install --default-timeout=100 -r requirements.txt
RUN python setup.py install RUN python setup.py install
RUN cd ~/ \ RUN cd ~/ \
&& rm /etc/ord/* \
&& rm -fr /tmp/ranger-agent \ && rm -fr /tmp/ranger-agent \
&& mkdir /var/log/ranger-agent && mkdir /var/log/ranger-agent
# Create user aic-ord # Create user ranger_agent
RUN useradd -ms /bin/bash aic-ord RUN useradd -u 1000 -ms /bin/bash ranger_agent
# Change permissions # Change permissions
RUN chown -R aic-ord: /home/aic-ord \ RUN chown -R ranger_agent: /home/ranger_agent \
&& chown -R aic-ord: /etc/ord \ && chown -R ranger_agent: /etc/ord \
&& chown -R aic-ord: /var/log/ranger-agent && chown -R ranger_agent: /var/log/ranger-agent
# Set work directory # Set work directory
USER aic-ord USER ranger_agent
WORKDIR /home/aic-ord/ WORKDIR /home/ranger_agent/

1
ord/client/getrepo.py
View File

@ -38,6 +38,7 @@ ORM_OPTS = [
cfg.CONF.register_opts(ORM_OPTS, group='orm') cfg.CONF.register_opts(ORM_OPTS, group='orm')
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
subprocess._has_poll = False
class TemplateRepoClient(object): class TemplateRepoClient(object):