From a7c3851d29d0085c3e39f72fbf79244aa64c5f50 Mon Sep 17 00:00:00 2001 From: "Swapnil Kulkarni (coolsvap)" Date: Mon, 25 Jul 2016 08:55:33 +0530 Subject: Customizations for mistral This patchset contains customization of Dockerfiles of mistral containers Change-Id: I0ad1e9aa80b563da17275268ca90b618da350b06 Partially-implements: blueprint third-party-plugin-support --- docker/mistral/mistral-api/Dockerfile.j2 | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'docker/mistral/mistral-api') diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2 index c2b3e3ea8..ed90c8b0b 100644 --- a/docker/mistral/mistral-api/Dockerfile.j2 +++ b/docker/mistral/mistral-api/Dockerfile.j2 @@ -1,25 +1,21 @@ FROM {{ namespace }}/{{ image_prefix }}mistral-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-mistral-api \ - && yum clean all - + {% set mistral_api_packages = ['openstack-mistral-api'] %} {% elif base_distro in ['ubuntu'] %} - -RUN apt-get -y install --no-install-recommends \ - mistral-api \ - && apt-get clean - + {% set mistral_api_packages = ['mistral-api'] %} {% endif %} +RUN {{ macros.install_packages(mistral_api_packages | customizable("packages")) }} {% endif %} COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start +{% block mistral_api_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} USER mistral -- cgit v1.2.3