Fluentd to 1.7.3, Elasticsearch to 7.4.0

Change-Id: I1dc69540db592eff3c05f433b39df003d93a6fab
Signed-off-by: Balazs Szekeres <balazs.szekeres@nokia.com>

diff --git a/SPECS/fluentd.spec b/SPECS/fluentd.spec
index 8ccdd15..348b4d4 100644 (file)
--- a/SPECS/fluentd.spec
+++ b/SPECS/fluentd.spec
@@ -14,7 +14,7 @@
 
 %define COMPONENT fluentd
 %define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 1.6.3
+%define RPM_MAJOR_VERSION 1.7.3
 %define RPM_MINOR_VERSION 0
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 

diff --git a/docker-build/fluentd/Dockerfile b/docker-build/fluentd/Dockerfile
index d4b6456..de6faca 100644 (file)
--- a/docker-build/fluentd/Dockerfile
+++ b/docker-build/fluentd/Dockerfile
@@ -33,12 +33,12 @@ RUN apk update \
         ruby ruby-irb \
         su-exec==${SU_EXEC_VERSION} \
         dumb-init==${DUMB_INIT_VERSION} \
+        libffi-dev \
 &&  apk add --no-cache --virtual .build-deps \
         build-base \
         ruby-dev \
         wget \
         gnupg \
-        libffi-dev \
 &&  update-ca-certificates \
 &&  echo 'gem: --no-document' >> /etc/gemrc \
 &&  gem install oj -v 2.18.3 \