From 25f74fb943d76f46d5b166ba8c0506a4a2ce06ca Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Thu, 18 Jun 2020 17:09:24 +0100
Subject: Upgrade to Logstash 6

Elasticsearch and Kibana 6 are used on all distros, but Logstash
is still pinned at 2 which is not compatible. See the product
compatibility matrix [1].

[1] https://www.elastic.co/support/matrix#matrix_compatibility

Partial-Bug: #1884090
Change-Id: I1579e762bcfb07f0baa73507eb9955ae2f83c4ec
---
 docker/base/Dockerfile.j2 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'docker/base')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index fd2ced890..f761da6dd 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -104,14 +104,11 @@ RUN {{ macros.install_packages(base_centos_language_packages | customizable("cen
     ] %}
 {% elif base_arch == 'aarch64' %}
     {% set base_yum_repo_files = [
+        'elasticsearch.repo',
         'grafana.repo',
         'rabbitmq_rabbitmq-server.repo',
         'rabbitmq_rabbitmq-erlang-aarch64.repo',
     ] %}
-    # FIXME(mgoddard): Not available for CentOS 8 yet.
-    #
-    #   'elasticsearch.repo',
-    #
 
     {% set base_yum_repo_keys = [
         'https://packages.grafana.com/gpg.key',
-- 
cgit v1.2.3