diff options
| author | Vikram Hosakote <vhosakot@cisco.com> | 2016-03-12 05:11:00 +0000 |
|---|---|---|
| committer | Vikram Hosakote <vhosakot@cisco.com> | 2016-03-18 04:05:30 +0000 |
| commit | ec3baf0428d014310482146f5196d78ad670e72a (patch) | |
| tree | 1bf0544c6c16b4f8ed91c572f09f509fdea0563d /docker/kibana | |
| parent | f5bdcfbb607ce6b9604ebc6750b31e2361e168b9 (diff) | |
| download | kolla-ec3baf0428d014310482146f5196d78ad670e72a.tar.gz kolla-ec3baf0428d014310482146f5196d78ad670e72a.zip | |
Install Elasticsearch and Kibana packages using yum/apt-get
Test results of this patch set are at
http://paste.openstack.org/show/490450/.
Change-Id: I2957cc70fcca34706ec50a630d785f0630c3f5c0
Closes-Bug: #1553203
Diffstat (limited to 'docker/kibana')
| -rw-r--r-- | docker/kibana/Dockerfile.j2 | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2 index 3868e3a8d..7647866a0 100644 --- a/docker/kibana/Dockerfile.j2 +++ b/docker/kibana/Dockerfile.j2 @@ -1,18 +1,22 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} -ENV KIBANA_VERSION 4.3.1 -ENV KIBANA_DIR /opt/kibana/ -ENV KIBANA_ARCHIVE kibana-${KIBANA_VERSION}-linux-x64.tar.gz - RUN useradd -r -m --user-group kibana \ && usermod -a -G kolla kibana -RUN curl "https://download.elastic.co/kibana/kibana/$KIBANA_ARCHIVE" -o $KIBANA_ARCHIVE \ - && mkdir -p $KIBANA_DIR \ - && tar -xz --strip-components=1 -f $KIBANA_ARCHIVE -C $KIBANA_DIR \ - && chown -R kibana:kibana $KIBANA_DIR \ - && rm -f $KIBANA_ARCHIVE +{% 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 install -y --no-install-recommends \ + kibana \ + && apt-get clean + +{% endif %} {{ include_footer }} |