Fluentd to 1.7.3, Elasticsearch to 7.4.0

[ta/caas-logging.git] / docker-build / fluentd / Dockerfile

diff --git a/docker-build/fluentd/Dockerfile b/docker-build/fluentd/Dockerfile
index 1d805f9..de6faca 100644 (file)
--- a/docker-build/fluentd/Dockerfile
+++ b/docker-build/fluentd/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 FROM alpine:3.9
-MAINTAINER Levente Kale <levente.kale@nokia.com> 
+MAINTAINER Levente Kale <levente.kale@nokia.com>
 
 ARG VERSION
 ENV FLUENTD_VERSION=$VERSION
@@ -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 \
@@ -48,6 +48,7 @@ RUN apk update \
 &&  gem install fluent-plugin-record-reformer \
 &&  gem install fluent-plugin-rewrite-tag-filter \
 &&  gem install fluent-plugin-elasticsearch \
+&&  gem install fluent-plugin-remote_syslog \
 &&  gem install fluent-plugin-kubernetes_metadata_filter \
 &&  gem install bigdecimal \
 &&  gem install etc \
@@ -60,8 +61,3 @@ RUN apk update \
 &&  mkdir -p /fluentd/etc /fluentd/plugins \
 &&  chmod +x /bin/entrypoint.sh \
 &&  chmod 700 /fluentd/log
-
-# Copy configuration files
-# TODO: change it to a dynamic ConfigMap, in case something needs to be run-time configurable
-COPY ./conf/fluent.conf /fluentd/etc/
-