fix git repo and ssh key issue
Change-Id: I2dd09463a2cddbf62a2b4f8627af7e29d4ea6e8e
This commit is contained in:
parent
eb90f3be63
commit
08df4c6200
16
Dockerfile
16
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/
|
||||
|
@ -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):
|
||||
|
Loading…
Reference in New Issue
Block a user