From 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 1 Apr 2022 13:41:14 +0200 Subject: docker: drop binary parts Big patch drops all mentions of binary images support. Suggestions are welcome how to split it into parts or handle better. Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3 --- docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 40 +++++++------------------- 1 file changed, 10 insertions(+), 30 deletions(-) (limited to 'docker/nova/nova-spicehtml5proxy') 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")) }} -- cgit v1.2.3