Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fluent-plugin-grafana-loki: Update fluentd base image to current images (edge) #1703

Merged
merged 1 commit into from
Feb 21, 2020
Merged

fluent-plugin-grafana-loki: Update fluentd base image to current images (edge) #1703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions fluentd/fluent-plugin-grafana-loki/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
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

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 \
Expand All @@ -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
Expand All @@ -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"]
ENTRYPOINT ["/fluentd/entrypoint.sh"]
2 changes: 1 addition & 1 deletion fluentd/fluent-plugin-grafana-loki/docker/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'