6992049323
Add 'rhel' to list for RPM based distros. Also sort the distro list for rpm packages for affected lines. Change-Id: Ied4cb3e9763d6c6359f314d16185383ac3e006ed Partially-Implements: blueprint rhel-based-image-support
26 lines
600 B
Django/Jinja
26 lines
600 B
Django/Jinja
FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-nova-base:{{ tag }}
|
|
MAINTAINER Kolla Project (https://launchpad.net/kolla)
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
|
|
|
|
RUN yum -y install \
|
|
novnc \
|
|
openstack-nova-novncproxy \
|
|
&& yum clean all
|
|
|
|
{% endif %}
|
|
{% elif install_type == 'source' %}
|
|
|
|
ADD nova-novncproxy-archive /nova-novncproxy-source
|
|
RUN ln -s nova-novncproxy-source/* /usr/share/novnc
|
|
|
|
{% endif %}
|
|
|
|
COPY start.sh /
|
|
COPY config-external.sh /opt/kolla/
|
|
|
|
CMD ["/start.sh"]
|
|
|
|
{{ include_footer }}
|