Merge "Customizations for kibana"

This commit is contained in:
Jenkins 2016-08-28 16:25:37 +00:00 committed by Gerrit Code Review
commit 4b7852096f
1 changed files with 6 additions and 13 deletions

View File

@ -1,23 +1,16 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
RUN useradd -r -m --user-group kibana \
&& usermod -a -G kolla kibana
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
kibana \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get -y install --no-install-recommends \
kibana \
&& apt-get clean
{% endif %}
{% set kibana_packages = ['kibana'] %}
RUN {{ macros.install_packages(kibana_packages | customizable("packages")) }}
{% block kibana_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }}
USER kibana