Skip to content

Commit f2adf33

Browse files
committed
update fluentd to 1.8.0 / fixed gemfile / fixed shellcheck lint problems by using xarg
Signed-off-by: André Bauer <[email protected]>
1 parent 4e35750 commit f2adf33

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
source 'https://rubygems.org'
22

3-
gem 'activesupport', '~>6.0.1'
4-
gem 'fluentd', '<=1.7.4'
5-
gem 'fluent-plugin-concat', '~>2.4.0'
6-
gem 'fluent-plugin-detect-exceptions', '~>0.0.13'
7-
gem 'fluent-plugin-elasticsearch', '~>3.7.1'
8-
gem 'fluent-plugin-kubernetes_metadata_filter', '~>2.4.0'
9-
gem 'fluent-plugin-multi-format-parser', '~>1.0.0'
10-
gem 'fluent-plugin-prometheus', '~>1.7.0'
11-
gem 'fluent-plugin-systemd', '~>1.0.2'
12-
gem 'oj', '~>3.10.0'
3+
gem 'activesupport', '6.0.2.1'
4+
gem 'fluentd', '1.8.0'
5+
gem 'fluent-plugin-concat', '2.4.0'
6+
gem 'fluent-plugin-detect-exceptions', '0.0.13'
7+
gem 'fluent-plugin-elasticsearch', '3.8.0'
8+
gem 'fluent-plugin-kubernetes_metadata_filter', '2.4.1'
9+
gem 'fluent-plugin-multi-format-parser', '1.0.0'
10+
gem 'fluent-plugin-prometheus', '1.7.0'
11+
gem 'fluent-plugin-systemd', '1.0.2'
12+
gem 'oj', '3.10.0'

cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
PREFIX = quay.io/fluentd_elasticsearch
1818
IMAGE = fluentd
19-
TAG = v2.8.0
19+
TAG = v2.9.0
2020

2121
build:
2222
docker build --tag ${PREFIX}/${IMAGE}:${TAG} .

cluster/addons/fluentd-elasticsearch/fluentd-es-image/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ BUILD_DEPS="make gcc g++ libc6-dev ruby-dev libffi-dev"
2828

2929
# apt install
3030
apt-get update
31-
apt-get install -y --no-install-recommends "${BUILD_DEPS}" ca-certificates libjemalloc2 ruby
31+
echo "${BUILD_DEPS} ca-certificates libjemalloc2 ruby" | xargs apt-get install -y --no-install-recommends
3232

3333
# ruby install
3434
echo 'gem: --no-document' >> /etc/gemrc
3535
gem install --file Gemfile
3636

3737
# cleanup
38-
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false "${BUILD_DEPS}"
38+
echo "${BUILD_DEPS}" | xargs apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false
3939
apt-get clean -y
4040
rm -rf \
4141
/var/cache/debconf/* \

0 commit comments

Comments
 (0)