Don't use --upgrade when installing into venv
In venv --upgrade does nothing good since venv have constraints-bound versions of everything installed. It does bad thing though: it tries to upgrade setuptools (they are not mentioned in upstream constraints.txt) and break further building. Change-Id: Idc8ae229479fcbf9f524703df2f74e1f83016a7f
This commit is contained in:
parent
073415fad8
commit
a135808360
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue