From d3c60d0035d62ece4277f59c40aabe570539face Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Fri, 5 Aug 2016 11:50:16 +0000 Subject: Customizations for Nova Change-Id: I7556d6cd473516c7ceb4aba7c1ba1130af2544ee Partially-implements: blueprint third-party-plugin-support --- docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'docker/nova/nova-spicehtml5proxy') diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index 420832014..a6f76c2ec 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -1,28 +1,36 @@ FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} MAINTAINER {{ maintainer }} +{% import "macros.j2" as macros with context %} + {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum -y install \ - openstack-nova-spicehtml5proxy \ - spice-html5 \ - && yum clean all + {% set nova_spicehtml5proxy_packages = [ + 'openstack-nova-spicehtml5proxy', + 'spice-html5' + ] %} {% elif base_distro in ['ubuntu'] %} -RUN apt-get -y install --no-install-recommends \ - nova-spiceproxy \ - && apt-get clean + {% set nova_spicehtml5proxy_packages = [ + 'nova-spiceproxy' + ] %} {% endif %} + +{{ macros.install_packages(nova_spicehtml5proxy_packages | customizable("packages")) }} + {% elif install_type == 'source' %} ADD nova-spicehtml5proxy-archive /usr/share/nova-spicehtml5proxy-source -RUN cd /usr/share && ln -s nova-spicehtml5proxy-source/* spice-html5 +RUN cd /usr/share \ + && ln -s nova-spicehtml5proxy-source/* spice-html5 {% endif %} +{% block nova_spicehtml5proxy_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} USER nova -- cgit v1.2.3