diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-28 16:25:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-28 16:25:37 +0000 |
| commit | 4b7852096f432151ba00325f62d2dc8336a9660c (patch) | |
| tree | 1eef991019ff924b7d952f84fb2b48153ee6de6c | |
| parent | ecf85d8d78415a34335c4ce6d553df5ab3c9aa64 (diff) | |
| parent | 2187125b134102e3dd04c1819d54df6675c080b7 (diff) | |
| download | kolla-4b7852096f432151ba00325f62d2dc8336a9660c.tar.gz kolla-4b7852096f432151ba00325f62d2dc8336a9660c.zip | |
Merge "Customizations for kibana"
| -rw-r--r-- | docker/kibana/Dockerfile.j2 | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2 index 10da65601..0eddf0ae0 100644 --- a/docker/kibana/Dockerfile.j2 +++ b/docker/kibana/Dockerfile.j2 @@ -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 |