diff options
Diffstat (limited to 'docker/nova/nova-spicehtml5proxy')
| -rw-r--r-- | docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index f630cb33f..8003ac9b7 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_package_type == 'rpm' %} {% set nova_spicehtml5proxy_packages = [ 'numpy', @@ -14,7 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'spice-html5' ] %} - {% elif base_distro in ['debian', 'ubuntu'] %} + {% elif base_package_type == 'deb' %} {% set nova_spicehtml5proxy_packages = [ 'nova-spiceproxy', @@ -24,14 +24,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_package_type == 'rpm' %} {% set nova_spicehtml5proxy_packages = [ 'numpy', 'spice-html5' ] %} - {% elif base_distro in ['debian', 'ubuntu'] %} + {% elif base_package_type == 'deb' %} {% set nova_spicehtml5proxy_packages = [ 'spice-html5', |