cda0459ad1
There were some inconsistencies with pip install instructions thoughout Kolla. We fix those here. Additionally, we fix the virtualenv to properly use the site-packages on the host if a library is not available in the venv. Change-Id: Ib84d48e8826bb96060338b3fa0782620c98794a8 Related-Bug: #1524684 Closes-Bug: #1529434
26 lines
762 B
Django/Jinja
26 lines
762 B
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
MAINTAINER {{ maintainer }}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
|
|
RUN yum -y install \
|
|
openstack-trove-common \
|
|
&& yum clean all
|
|
|
|
{% endif %}
|
|
|
|
{% elif install_type == 'source' %}
|
|
|
|
ADD trove-base-archive /trove-base-source
|
|
RUN ln -s trove-base-source/* trove \
|
|
&& useradd --user-group trove \
|
|
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /trove \
|
|
&& mkdir -p /etc/trove /var/log/trove /home/trove \
|
|
&& cp -r /trove/etc/* /etc/trove/ \
|
|
&& chown -R trove: /etc/trove /var/log/trove /home/trove
|
|
|
|
{% endif %}
|
|
|
|
RUN usermod -a -G kolla trove
|