update fluentd to 1.8.0 / fixed gemfile / fixed shellcheck lint problems by using xarg

Signed-off-by: André Bauer <monotek23@gmail.com>
This commit is contained in:
André Bauer 2019-12-19 14:33:16 +01:00
parent 4e35750abc
commit f2adf33bc8
3 changed files with 13 additions and 13 deletions

View File

@ -1,12 +1,12 @@
source 'https://rubygems.org'
gem 'activesupport', '~>6.0.1'
gem 'fluentd', '<=1.7.4'
gem 'fluent-plugin-concat', '~>2.4.0'
gem 'fluent-plugin-detect-exceptions', '~>0.0.13'
gem 'fluent-plugin-elasticsearch', '~>3.7.1'
gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.4.0'
gem 'fluent-plugin-multi-format-parser', '~>1.0.0'
gem 'fluent-plugin-prometheus', '~>1.7.0'
gem 'fluent-plugin-systemd', '~>1.0.2'
gem 'oj', '~>3.10.0'
gem 'activesupport', '6.0.2.1'
gem 'fluentd', '1.8.0'
gem 'fluent-plugin-concat', '2.4.0'
gem 'fluent-plugin-detect-exceptions', '0.0.13'
gem 'fluent-plugin-elasticsearch', '3.8.0'
gem 'fluent-plugin-kubernetes_metadata_filter', '2.4.1'
gem 'fluent-plugin-multi-format-parser', '1.0.0'
gem 'fluent-plugin-prometheus', '1.7.0'
gem 'fluent-plugin-systemd', '1.0.2'
gem 'oj', '3.10.0'

View File

@ -16,7 +16,7 @@
PREFIX = quay.io/fluentd_elasticsearch
IMAGE = fluentd
TAG = v2.8.0
TAG = v2.9.0
build:
docker build --tag ${PREFIX}/${IMAGE}:${TAG} .

View File

@ -28,14 +28,14 @@ BUILD_DEPS="make gcc g++ libc6-dev ruby-dev libffi-dev"
# apt install
apt-get update
apt-get install -y --no-install-recommends "${BUILD_DEPS}" ca-certificates libjemalloc2 ruby
echo "${BUILD_DEPS} ca-certificates libjemalloc2 ruby" | xargs apt-get install -y --no-install-recommends
# ruby install
echo 'gem: --no-document' >> /etc/gemrc
gem install --file Gemfile
# cleanup
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false "${BUILD_DEPS}"
echo "${BUILD_DEPS}" | xargs apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false
apt-get clean -y
rm -rf \
/var/cache/debconf/* \