From 24bc2d662322958d7ae20e2cb67bd9fe4a627a53 Mon Sep 17 00:00:00 2001 From: Emil 'Skeen' Madsen Date: Fri, 21 Feb 2020 02:39:18 +0100 Subject: [PATCH] Update fluentd base image for docker. (#1703) Updated base image from: v1.3.2-debian to v1.9.2-debian-1.0. Changed ruby from 2.3.0 to 2.6.0. --- fluentd/fluent-plugin-grafana-loki/Dockerfile | 16 ++++++++-------- .../fluent-plugin-grafana-loki/docker/Gemfile | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fluentd/fluent-plugin-grafana-loki/Dockerfile b/fluentd/fluent-plugin-grafana-loki/Dockerfile index 5767390161..796d489ba4 100644 --- a/fluentd/fluent-plugin-grafana-loki/Dockerfile +++ b/fluentd/fluent-plugin-grafana-loki/Dockerfile @@ -1,10 +1,10 @@ -FROM fluent/fluentd:v1.3.2-debian +FROM fluent/fluentd:v1.9.2-debian-1.0 USER root WORKDIR /home/fluent -ENV PATH /fluentd/vendor/bundle/ruby/2.3.0/bin:$PATH -ENV GEM_PATH /fluentd/vendor/bundle/ruby/2.3.0 -ENV GEM_HOME /fluentd/vendor/bundle/ruby/2.3.0 +ENV PATH /fluentd/vendor/bundle/ruby/2.6.0/bin:$PATH +ENV GEM_PATH /fluentd/vendor/bundle/ruby/2.6.0 +ENV GEM_HOME /fluentd/vendor/bundle/ruby/2.6.0 # skip runtime bundler installation ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1 @@ -12,7 +12,7 @@ COPY docker/Gemfile* /fluentd/ RUN buildDeps="sudo make gcc g++ libc-dev ruby-dev" \ && apt-get update \ && apt-get install -y --no-install-recommends \ - $buildDeps libsystemd0 net-tools libjemalloc1 \ + $buildDeps libsystemd0 net-tools libjemalloc2 \ && gem install bundler --version 1.16.2 \ && bundle config silence_root_warning true \ && bundle install --gemfile=/fluentd/Gemfile --path=/fluentd/vendor/bundle \ @@ -22,7 +22,7 @@ RUN buildDeps="sudo make gcc g++ libc-dev ruby-dev" \ -o APT::AutoRemove::RecommendsImportant=false \ $buildDeps \ && rm -rf /var/lib/apt/lists/* \ - /home/fluent/.gem/ruby/2.3.0/cache/*.gem \ + /home/fluent/.gem/ruby/2.6.0/cache/*.gem \ /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem COPY docker/entrypoint.sh /fluentd/entrypoint.sh @@ -35,7 +35,7 @@ ENV FLUENTD_OPT="" ENV LOKI_URL "https://logs-us-west1.grafana.net" # See https://packages.debian.org/stretch/amd64/libjemalloc1/filelist -ENV LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libjemalloc.so.1" +ENV LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libjemalloc.so.2" # Overwrite ENTRYPOINT to run fluentd as root for /var/log / /var/lib -ENTRYPOINT ["/fluentd/entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/fluentd/entrypoint.sh"] diff --git a/fluentd/fluent-plugin-grafana-loki/docker/Gemfile b/fluentd/fluent-plugin-grafana-loki/docker/Gemfile index 4b20b3d3e0..6b8e2a5040 100644 --- a/fluentd/fluent-plugin-grafana-loki/docker/Gemfile +++ b/fluentd/fluent-plugin-grafana-loki/docker/Gemfile @@ -6,4 +6,4 @@ gem 'fluent-plugin-kubernetes_metadata_filter', '~> 2.1.6' gem 'fluent-plugin-multi-format-parser', '~>1.0.0' gem 'fluent-plugin-prometheus', '~>1.4.0' gem 'fluent-plugin-systemd', '~> 1.0.1' -gem 'fluentd', '1.6.2' +gem 'fluentd', '1.9.0'