From bfb7e41ed0a63f97c2096cd2c792e02208db47a7 Mon Sep 17 00:00:00 2001 From: Sylvain Baubeau Date: Tue, 26 Mar 2019 15:00:24 +0100 Subject: Upgrade Elasticsearch and Kibana to 6.x Start using oss tagged binaries. These binaries contain only features that are available under the Apache 2.0 license. Implements: blueprint elasticsearch-kibana-version-upgrade Co-authored-by: Dincer Celik Change-Id: I8b52b2630a72393bf4b9c7095fc67db6c36c27fa --- docker/elasticsearch/elasticsearch/Dockerfile.j2 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'docker/elasticsearch') diff --git a/docker/elasticsearch/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/elasticsearch/Dockerfile.j2 index 2bab2d8dc..d5bd4ce04 100644 --- a/docker/elasticsearch/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/elasticsearch/Dockerfile.j2 @@ -13,19 +13,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set elasticsearch_packages = [ - 'elasticsearch', - 'java-1.8.0-openjdk-headless', + 'java-11-openjdk-headless', + 'elasticsearch-oss', ] %} -ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/ +ENV JAVA_HOME /usr/lib/jvm/jre-11-openjdk/ {% elif base_package_type == 'deb' %} {% set elasticsearch_packages = [ - 'default-jre-headless', - 'elasticsearch', + 'elasticsearch-oss', ] %} -ENV JAVA_HOME /usr/lib/jvm/java-{{java_version}}-openjdk-{{debian_arch}}/ +# NOTE(osmanlicilegi): post-install script of elasticsearch fails when trying to +# install elasticsearch and java together. +{{ macros.install_packages(['default-jre-headless']) }} + +ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-{{debian_arch}}/ {% endif %} -- cgit v1.2.3