Logging containers updated

Fluentd version cahnge to 1.5.0
Elasticsearch version change to 7.1.0

Change-Id: I03bd67c72aa6039732ed51fe02e26056ecfce3ed
Signed-off-by: Szekeres, Balazs (Nokia - HU/Budapest) <balazs.szekeres@nokia.com>

diff --git a/SPECS/elasticsearch.spec b/SPECS/elasticsearch.spec
index b10d972..24d20c7 100644 (file)
--- a/SPECS/elasticsearch.spec
+++ b/SPECS/elasticsearch.spec
@@ -14,8 +14,8 @@
 
 %define COMPONENT elasticsearch
 %define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 6.7.0
-%define RPM_MINOR_VERSION 1
+%define RPM_MAJOR_VERSION 7.1.0
+%define RPM_MINOR_VERSION 0
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 
 Name:           %{RPM_NAME}

diff --git a/SPECS/fluentd.spec b/SPECS/fluentd.spec
index e4d9c3b..99e3836 100644 (file)
--- a/SPECS/fluentd.spec
+++ b/SPECS/fluentd.spec
@@ -14,8 +14,8 @@
 
 %define COMPONENT fluentd
 %define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 1.4.1
-%define RPM_MINOR_VERSION 1
+%define RPM_MAJOR_VERSION 1.5.0
+%define RPM_MINOR_VERSION 0
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 
 Name:           %{RPM_NAME}

diff --git a/docker-build/elasticsearch/Dockerfile b/docker-build/elasticsearch/Dockerfile
index ed0043a..a67b12d 100644 (file)
--- a/docker-build/elasticsearch/Dockerfile
+++ b/docker-build/elasticsearch/Dockerfile
@@ -21,9 +21,7 @@ ENV ES_VERSION=$VERSION
 ENV PATH /usr/share/elasticsearch/bin:$PATH
 ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk
 ENV DOWNLOAD_URL "https://artifacts.elastic.co/downloads/elasticsearch"
-ENV ES_TARBAL "${DOWNLOAD_URL}/elasticsearch-${ES_VERSION}.tar.gz"
-ENV ES_TARBALL_ASC "${DOWNLOAD_URL}/elasticsearch-${ES_VERSION}.tar.gz.asc"
-ENV EXPECTED_SHA_URL "${DOWNLOAD_URL}/elasticsearch-${ES_VERSION}.tar.gz.sha512"
+ENV ES_TARBAL "${DOWNLOAD_URL}/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz"
 
 WORKDIR /usr/share/elasticsearch
 
@@ -57,6 +55,10 @@ COPY healthcheck /usr/local/bin/
 COPY elasticsearch-setindex /usr/share/elasticsearch
 
 RUN chown -R elasticsearch:elasticsearch /usr/share/elasticsearch /etc/logrotate.d/elasticsearch /usr/local/bin/healthcheck \
-&&  chmod +x /usr/share/elasticsearch/elasticsearch-setindex
+&&  chmod +x /usr/share/elasticsearch/elasticsearch-setindex \
+# workaround for Elasticsearch: this way ES can list the used plugins
+&&  cp -a /usr/share/elasticsearch/modules/* /usr/share/elasticsearch/plugins/ \
+&&  chown -R elasticsearch:elasticsearch /usr/share/elasticsearch/plugins
+# workaround end
 
 CMD ["elasticsearch"]