diff options
| -rw-r--r-- | docker/base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/base/kibana.yum.repo | 6 | ||||
| -rw-r--r-- | docker/base/sources.list | 3 | ||||
| -rw-r--r-- | docker/elasticsearch/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/kibana/Dockerfile.j2 | 22 | ||||
| -rwxr-xr-x | tools/setup_gate.sh | 1 |
6 files changed, 28 insertions, 11 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index be506e592..afcc5b30b 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -21,6 +21,9 @@ ENV KOLLA_INSTALL_METATYPE {{ install_metatype }} # Turns on Elasticsearch repos COPY elasticsearch.yum.repo /etc/yum.repos.d/elasticsearch.repo +# Turns on Kibana repo +COPY kibana.yum.repo /etc/yum.repos.d/kibana.yum.repo + # Turns on MariaDB repos throughout the RPM build COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo diff --git a/docker/base/kibana.yum.repo b/docker/base/kibana.yum.repo new file mode 100644 index 000000000..4d5d3e50b --- /dev/null +++ b/docker/base/kibana.yum.repo @@ -0,0 +1,6 @@ +[kibana-4.4] +name=Kibana repository for 4.4.x packages +baseurl=http://packages.elastic.co/kibana/4.4/centos +gpgcheck=1 +gpgkey=http://packages.elastic.co/GPG-KEY-elasticsearch +enabled=1 diff --git a/docker/base/sources.list b/docker/base/sources.list index 9e19fe490..ecc71223e 100644 --- a/docker/base/sources.list +++ b/docker/base/sources.list @@ -21,3 +21,6 @@ deb http://download.ceph.com/debian-hammer/ trusty main # Elastic repo deb http://packages.elastic.co/elasticsearch/2.x/debian stable main + +# Kibana repo +deb http://packages.elastic.co/kibana/4.4/debian stable main diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2 index aa9f43c1b..c433db54b 100644 --- a/docker/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/Dockerfile.j2 @@ -8,7 +8,7 @@ ENV JAVA_HOME /usr/lib/jvm/jre-1.7.0-openjdk/ RUN yum -y install \ java-1.7.0-openjdk \ - elasticsearch-2.1.1 \ + elasticsearch \ && yum clean all {% elif base_distro in ['ubuntu', 'debian'] %} @@ -17,7 +17,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.7.0-openjdk-amd64/ RUN apt-get install -y --no-install-recommends \ openjdk-7-jre \ - elasticsearch=2.1.1 \ + elasticsearch \ && apt-get clean {% endif %} 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 }} diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh index 4f0cee61d..aa74a9e62 100755 --- a/tools/setup_gate.sh +++ b/tools/setup_gate.sh @@ -32,6 +32,7 @@ deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main deb http://repo.percona.com/apt trusty main deb http://download.ceph.com/debian-hammer/ trusty main deb http://packages.elastic.co/elasticsearch/2.x/debian stable main +deb http://packages.elastic.co/kibana/4.4/debian stable main EOF fi } |