|
|
|
@ -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"] |