ae1322ec10
This change updates the docker files to use base_package_type instead of doing specific distro checks for the rhel/deb generic cases. The base_distro is still available and is used when a specific distro needs a customization but if the differences are purely rpm vs deb, then the base_package_type can be used. Change-Id: I8d720bb185df65a0178061ccf20b1ab2265da2c5
50 lines
1.2 KiB
Django/Jinja
50 lines
1.2 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
|
|
{% block nova_spicehtml5proxy_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_package_type == 'rpm' %}
|
|
|
|
{% set nova_spicehtml5proxy_packages = [
|
|
'numpy',
|
|
'openstack-nova-spicehtml5proxy',
|
|
'spice-html5'
|
|
] %}
|
|
|
|
{% elif base_package_type == 'deb' %}
|
|
|
|
{% set nova_spicehtml5proxy_packages = [
|
|
'nova-spiceproxy',
|
|
'websockify'
|
|
] %}
|
|
|
|
{% endif %}
|
|
|
|
{% elif install_type == 'source' %}
|
|
{% if base_package_type == 'rpm' %}
|
|
|
|
{% set nova_spicehtml5proxy_packages = [
|
|
'numpy',
|
|
'spice-html5'
|
|
] %}
|
|
|
|
{% elif base_package_type == 'deb' %}
|
|
|
|
{% set nova_spicehtml5proxy_packages = [
|
|
'spice-html5',
|
|
'websockify'
|
|
] %}
|
|
|
|
{% endif %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(nova_spicehtml5proxy_packages | customizable("packages")) }}
|
|
|
|
{% block nova_spicehtml5proxy_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
|
|
USER nova
|