diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-11 09:39:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-11 09:39:28 +0000 |
| commit | 657820362dd0b52f8462054e043fd892d14fbe76 (patch) | |
| tree | d2675f8f172c08febc6f1eaf9900deec7b43c8ee /docker/nova/nova-spicehtml5proxy | |
| parent | 26fd382f176adbc104850f565df238253d8f9fc7 (diff) | |
| parent | 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (diff) | |
| download | kolla-657820362dd0b52f8462054e043fd892d14fbe76.tar.gz kolla-657820362dd0b52f8462054e043fd892d14fbe76.zip | |
Merge "docker: drop binary parts"
Diffstat (limited to 'docker/nova/nova-spicehtml5proxy')
| -rw-r--r-- | docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index 1351c48e5..e37af27df 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -7,40 +7,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} +{% if base_package_type == 'rpm' %} - {% set nova_spicehtml5proxy_packages = [ - 'openstack-nova-spicehtml5proxy', - 'python3-numpy', - 'spice-html5' - ] %} + {% set nova_spicehtml5proxy_packages = [ + 'python3-numpy', + 'spice-html5' + ] %} - {% elif base_package_type == 'deb' %} +{% elif base_package_type == 'deb' %} - {% set nova_spicehtml5proxy_packages = [ - 'nova-spiceproxy', - 'websockify' - ] %} + {% set nova_spicehtml5proxy_packages = [ + 'spice-html5', + 'websockify' + ] %} - {% endif %} - -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - - {% set nova_spicehtml5proxy_packages = [ - 'python3-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")) }} |