From 6ce67b81a70226913a1d19f0aefd2181c42d1cc6 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 15 Apr 2020 10:26:20 +0100 Subject: CentOS 8: enable elasticsearch and kibana images This is a follow up to I8b52b2630a72393bf4b9c7095fc67db6c36c27fa, which upgraded elasticsearch and kibana to 6.x. It did not enable the repositories or images for CentOS 8 however. This change enables elasticsearch and kibana images for CentOS 8. Change-Id: I7b375e493380c4e3d6b8c7b6f5ebc57c1b73043f Related: blueprint elasticsearch-kibana-version-upgrade --- docker/base/Dockerfile.j2 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'docker') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index a0a0ffebe..f6a67d9e9 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -82,6 +82,7 @@ RUN {{ macros.install_packages(base_centos_language_packages | customizable("cen {% if base_arch == 'x86_64' %} {% set base_yum_repo_files = [ + 'elasticsearch.repo', 'grafana.repo', 'influxdb.repo', 'rabbitmq_rabbitmq-server.repo', @@ -90,19 +91,15 @@ RUN {{ macros.install_packages(base_centos_language_packages | customizable("cen ] %} # FIXME(mgoddard): Not available for CentOS 8 yet. # 'crmsh.repo', - # 'elasticsearch.repo', # 'opendaylight.repo', {% set base_yum_repo_keys = [ + 'https://artifacts.elastic.co/GPG-KEY-elasticsearch', 'https://packages.grafana.com/gpg.key', 'https://repos.influxdata.com/influxdb.key', 'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc', 'https://packages.treasuredata.com/GPG-KEY-td-agent', ] %} - # FIXME(mgoddard): Not available for CentOS 8 yet. - # - # 'https://artifacts.elastic.co/GPG-KEY-elasticsearch', - # {% elif base_arch == 'aarch64' %} {% set base_yum_repo_files = [ 'grafana.repo', -- cgit v1.2.3