diff options
Diffstat (limited to 'docker/nova/nova-spicehtml5proxy')
| -rw-r--r-- | docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index f11bab9db..913d33e45 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -23,16 +23,26 @@ MAINTAINER {{ maintainer }} {% endif %} -{{ macros.install_packages(nova_spicehtml5proxy_packages | customizable("packages")) }} - {% elif install_type == 'source' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} -ADD nova-spicehtml5proxy-archive /usr/share/nova-spicehtml5proxy-source -RUN cd /usr/share \ - && ln -s nova-spicehtml5proxy-source/* spice-html5 + {% set nova_spicehtml5proxy_packages = [ + 'spice-html5', + 'numpy' + ] %} + + {% elif base_distro in ['ubuntu'] %} + {% 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 %} {{ include_footer }} |
