x
/
fuel-ccp-neutron
Code Issues Proposed changes

Merge "Don't use --upgrade when installing into venv"

This commit is contained in:
Jenkins 2017-03-09 10:39:55 +00:00 committed by Gerrit Code Review
parent b37c31dded a135808360
commit ce1cc38e6f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/neutron-base/Dockerfile.j2
View File

@ -23,7 +23,7 @@ RUN apt-get update \
RUN cd /neutron \
&& useradd --user-group neutron \
&& /var/lib/microservices/venv/bin/pip install --upgrade /neutron \
&& /var/lib/microservices/venv/bin/pip install /neutron \
&& mkdir -p /etc/neutron /usr/share/neutron /var/lib/neutron /home/neutron \
&& cp -r /neutron/etc/* /etc/neutron/ \
&& cp -r /neutron/etc/neutron/* /etc/neutron/ \
@ -38,14 +38,14 @@ RUN usermod -a -G microservices neutron \
&& chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/neutron_sudoers
RUN /var/lib/microservices/venv/bin/pip install --upgrade /libcalico \
RUN /var/lib/microservices/venv/bin/pip install /libcalico \
&& rm -rf /libcalico \
&& mkdir -p /var/log/calico /etc/calico \
&& /var/lib/microservices/venv/bin/pip install --upgrade /calico \
&& /var/lib/microservices/venv/bin/pip install /calico \
&& rm -rf /calico \
&& /var/lib/microservices/venv/bin/pip install --upgrade /networking-calico \
&& /var/lib/microservices/venv/bin/pip install /networking-calico \
&& rm -rf /networking-calico \
&& /var/lib/microservices/venv/bin/pip install --upgrade /networking-odl \
&& /var/lib/microservices/venv/bin/pip install /networking-odl \
&& rm -rf /networking-odl
ENV PATH /var/lib/microservices/venv/bin:$PATH