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: If86ed67b574db3323d36e1402c2795a9b5dcb7b2
This commit is contained in:
parent
f8e2969f59
commit
d0e0f97a42
|
@ -18,7 +18,7 @@ RUN apt-key adv --recv-keys --keyserver {{ url.ceph.debian.keyserver }} \
|
|||
|
||||
RUN useradd --user-group --create-home --home-dir /var/lib/nova nova \
|
||||
&& chmod 755 /var/lib/nova \
|
||||
&& /var/lib/microservices/venv/bin/pip install --upgrade /nova \
|
||||
&& /var/lib/microservices/venv/bin/pip install /nova \
|
||||
&& mkdir -p /etc/nova /var/lib/nova /var/log/nova \
|
||||
&& cp -r /nova/etc/nova/* /etc/nova/ \
|
||||
&& chown -R nova: /etc/nova /var/lib/nova /var/log/nova \
|
||||
|
|
|
@ -25,7 +25,7 @@ RUN apt-get update \
|
|||
&& ln -s /usr/lib/python2.7/dist-packages/rbd.x86_64-linux-gnu.so /var/lib/microservices/venv/local/lib/python2.7/site-packages/rbd.x86_64-linux-gnu.so \
|
||||
&& sed -i 's/libvirt-python.*/\#libvirt-python==3.0.0/' /var/lib/microservices/venv/constraints.txt \
|
||||
&& pip install --upgrade https://libvirt.org/sources/python/libvirt-python-3.0.0.tar.gz \
|
||||
&& /var/lib/microservices/venv/bin/pip install --upgrade rtslib-fb \
|
||||
&& /var/lib/microservices/venv/bin/pip install rtslib-fb \
|
||||
&& rm -f /etc/machine-id \
|
||||
&& apt-get -y purge python-dev
|
||||
|
||||
|
|
Loading…
Reference in New Issue