diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-14 11:43:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-14 11:43:36 +0000 |
| commit | 504c76d0db9d65fcf289762268f53ee5296329f3 (patch) | |
| tree | a964172e86b39d1e9537c99e69b4bf2a114e6b39 /docker | |
| parent | 8518744133ec9cf5401021c09211fd985c386fe8 (diff) | |
| parent | bfb7e41ed0a63f97c2096cd2c792e02208db47a7 (diff) | |
| download | kolla-504c76d0db9d65fcf289762268f53ee5296329f3.tar.gz kolla-504c76d0db9d65fcf289762268f53ee5296329f3.zip | |
Merge "Upgrade Elasticsearch and Kibana to 6.x"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/apt_preferences.debian | 4 | ||||
| -rw-r--r-- | docker/base/elasticsearch.repo | 8 | ||||
| -rw-r--r-- | docker/elasticsearch/elasticsearch/Dockerfile.j2 | 15 | ||||
| -rw-r--r-- | docker/kibana/Dockerfile.j2 | 3 |
4 files changed, 15 insertions, 15 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index a7497d6d8..50aed13c3 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -23,12 +23,12 @@ Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster Pin-Priority: 100 # Unless it is kibana (on aarch64) -Package: kibana +Package: kibana kibana-oss Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster Pin-Priority: 600 # on x86-64 use upstream package for kibana -Package: kibana +Package: kibana kibana-oss Pin: release o=elastic,b=amd64 Pin-Priority: 700 diff --git a/docker/base/elasticsearch.repo b/docker/base/elasticsearch.repo index 16e589be1..b279f407b 100644 --- a/docker/base/elasticsearch.repo +++ b/docker/base/elasticsearch.repo @@ -1,8 +1,6 @@ -[elasticsearch-kibana-logstash-5.x] -name=ELK repository for 5.x packages -baseurl=https://artifacts.elastic.co/packages/5.x/yum +[elasticsearch-kibana-logstash-6.x] +name=ELK repository for 6.x packages +baseurl=https://artifacts.elastic.co/packages/oss-6.x/yum gpgcheck=1 gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch enabled=0 -autorefresh=1 -type=rpm-md 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 %} diff --git a/docker/kibana/Dockerfile.j2 b/docker/kibana/Dockerfile.j2 index c28f2a8d0..5d2d250df 100644 --- a/docker/kibana/Dockerfile.j2 +++ b/docker/kibana/Dockerfile.j2 @@ -11,8 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='kibana') }} -{% set kibana_packages = ['kibana'] %} - +{% set kibana_packages = ['kibana-oss'] %} {{ macros.install_packages(kibana_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_extend_start |