diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-06 16:18:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-06 16:18:36 +0000 |
| commit | b6ee58fcdf07c5ce7f2eef539d5ba106b1a3bfa1 (patch) | |
| tree | cce5da9236290f4ef9595796df597d12fc350802 /docker/mistral/mistral-executor | |
| parent | d692e4b6f9dfcf6cf77bf1f6de5678c036c9a257 (diff) | |
| parent | a7c3851d29d0085c3e39f72fbf79244aa64c5f50 (diff) | |
| download | kolla-b6ee58fcdf07c5ce7f2eef539d5ba106b1a3bfa1.tar.gz kolla-b6ee58fcdf07c5ce7f2eef539d5ba106b1a3bfa1.zip | |
Merge "Customizations for mistral"
Diffstat (limited to 'docker/mistral/mistral-executor')
| -rw-r--r-- | docker/mistral/mistral-executor/Dockerfile.j2 | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2 index b5b426cdd..3ab176bd7 100644 --- a/docker/mistral/mistral-executor/Dockerfile.j2 +++ b/docker/mistral/mistral-executor/Dockerfile.j2 @@ -1,21 +1,19 @@ 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-executor \ - && yum clean all - + {% set mistral_executor_packages = ['openstack-mistral-executor'] %} {% elif base_distro in ['ubuntu'] %} - -RUN apt-get -y install --no-install-recommends \ - mistral-executor \ - && apt-get clean - + {% set mistral_executor_packages = ['mistral-executor'] %} {% endif %} +RUN {{ macros.install_packages(mistral_executor_packages | customizable("packages")) }} + {% endif %} +{% block mistral_executor_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} |
