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

deps: update dependencies #638

Merged
merged 2 commits into from
May 13, 2024
Merged

deps: update dependencies #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4584e09
chore: upgrade ruby to 3.2.0
swiatekm May 9, 2024
163c301
deps: update dependencies
swiatekm May 9, 2024
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
1 change: 1 addition & 0 deletions .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.2.0
15 changes: 11 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG FLUENTD_ARCH
# Use the same ruby and debian version as is used in the target Fluentd image below.
FROM ruby:3.1.4-bullseye AS builder
FROM ruby:3.2-slim-bookworm AS builder

# Dependencies
RUN apt-get update \
Expand All @@ -13,15 +13,22 @@ RUN apt-get update \
make \
ruby-dev \
sudo \
unzip
unzip \
git

# Fluentd plugin dependencies
RUN gem install \
fluentd:1.16.2 \
async:1.31.0 \
async-http:0.60.2 \
bigdecimal:1.4.4 \
concurrent-ruby:1.1.10 \
fluentd:1.16.5 \
google-protobuf:3.21.12 \
json:2.6.3 \
lru_redux:1.1.0 \
net-http-persistent:4.0.2 \
oj:3.16.1 \
rexml:3.2.6 \
snappy:0.3.0 \
specific_install:0.3.8

Expand Down Expand Up @@ -99,7 +106,7 @@ RUN gem install \
RUN rm -rf /usr/local/bundle/cache/* \
&& find /usr/local/bundle/ -name "*.o" | xargs rm

FROM fluent/fluentd:v1.16.2-debian${FLUENTD_ARCH}-1.0
FROM fluent/fluentd:v1.16.5-debian${FLUENTD_ARCH}-1.0

USER root

Expand Down
13 changes: 7 additions & 6 deletions alpine.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use the same alpine and ruby version as in the target image below.
FROM ruby:3.1.4-alpine3.17 AS builder
FROM ruby:3.2.0-alpine3.17 AS builder

RUN apk update \
&& apk add \
Expand All @@ -13,18 +13,19 @@ RUN apk update \
RUN echo 'gem: --no-document' >> /etc/gemrc

# Fluentd plugin dependencies
# Copied from https://github.com/fluent/fluentd-docker-image/blob/6a497560b45add04b9033955ae2e97c2616aa356/v1.16/alpine/Dockerfile
# Copied from https://github.com/fluent/fluentd-docker-image/blob/6f347061a521a097cf8732044da110ab990416dc/v1.16/alpine/Dockerfile
RUN gem install \
async:1.30.3 \
async:1.31.0 \
async-http:0.60.2 \
bigdecimal:1.4.4 \
concurrent-ruby:1.1.10 \
fluentd:1.16.2 \
fluentd:1.16.5 \
google-protobuf:3.21.12 \
json:2.6.3 \
lru_redux:1.1.0 \
net-http-persistent:4.0.2 \
oj:3.15.0 \
oj:3.16.1 \
rexml:3.2.6 \
snappy:0.3.0 \
specific_install:0.3.8

Expand Down Expand Up @@ -103,7 +104,7 @@ RUN gem install \
# Use the same alpine and ruby version as the base image to prevent issues.
# https://github.com/fluent/fluentd-docker-image/blob/6a497560b45add04b9033955ae2e97c2616aa356/v1.16/alpine/Dockerfile
# https://pkgs.alpinelinux.org/packages?name=ruby&branch=v3.17
FROM ruby:3.1.4-alpine3.17
FROM ruby:3.2.0-alpine3.17

# 1. Update system packages.
# 2. Install required system packages.
Expand Down
6 changes: 3 additions & 3 deletions fluent-plugin-datapoint/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ PATH
remote: .
specs:
fluent-plugin-datapoint (2.0.0)
fluentd (= 1.16.2)
fluentd (= 1.16.5)

GEM
remote: https://rubygems.org/
specs:
concurrent-ruby (1.1.10)
cool.io (1.7.1)
fluentd (1.16.2)
fluentd (1.16.5)
bundler
cool.io (>= 1.4.5, < 2.0.0)
http_parser.rb (>= 0.5.1, < 0.9.0)
Expand Down Expand Up @@ -48,4 +48,4 @@ DEPENDENCIES
test-unit (~> 3.0)

BUNDLED WITH
2.4.1
2.5.10
2 changes: 1 addition & 1 deletion fluent-plugin-datapoint/fluent-plugin-datapoint.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "bundler", "~> 2.0"
spec.add_development_dependency "rake", "~> 13.0"
spec.add_development_dependency "test-unit", "~> 3.0"
spec.add_runtime_dependency "fluentd", "= 1.16.2"
spec.add_runtime_dependency "fluentd", "= 1.16.5"
end
22 changes: 9 additions & 13 deletions fluent-plugin-enhance-k8s-metadata/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ PATH
specs:
fluent-plugin-enhance-k8s-metadata (2.0.0)
concurrent-ruby (~> 1.1)
fluentd (= 1.16.2)
fluentd (= 1.16.5)
lru_redux (~> 1.1.0)
net-http-persistent (~> 4.0)

Expand All @@ -30,9 +30,8 @@ GEM
crack (1.0.0)
bigdecimal
rexml
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
faraday (1.10.0)
domain_name (0.6.20240107)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand All @@ -57,11 +56,11 @@ GEM
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
ffi (1.15.5)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
ffi (1.16.3)
ffi-compiler (1.3.2)
ffi (>= 1.15.5)
rake
fluentd (1.16.2)
fluentd (1.16.5)
bundler
cool.io (>= 1.4.5, < 2.0.0)
http_parser.rb (>= 0.5.1, < 0.9.0)
Expand All @@ -87,7 +86,7 @@ GEM
http_parser.rb (0.8.0)
lru_redux (1.1.0)
msgpack (1.5.1)
multipart-post (2.2.3)
multipart-post (2.4.1)
net-http-persistent (4.0.2)
connection_pool (~> 2.2)
power_assert (2.0.3)
Expand All @@ -106,9 +105,6 @@ GEM
concurrent-ruby (~> 1.0)
tzinfo-data (1.2022.1)
tzinfo (>= 1.0.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
webmock (3.23.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
Expand All @@ -128,4 +124,4 @@ DEPENDENCIES
webmock (~> 3.0)

BUNDLED WITH
2.4.1
2.5.10
2 changes: 1 addition & 1 deletion fluent-plugin-enhance-k8s-metadata/fluent-plugin-enhance-k8s-metadata.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
spec.require_paths = ['lib']

spec.add_runtime_dependency 'concurrent-ruby', '~> 1.1'
spec.add_runtime_dependency "fluentd", "= 1.16.2"
spec.add_runtime_dependency "fluentd", "= 1.16.5"
# spec.add_runtime_dependency 'kubeclient', '4.9.1' # Git version of Kubeclient specified in Gemfile
spec.add_runtime_dependency 'lru_redux', '~> 1.1.0'
spec.add_runtime_dependency 'net-http-persistent', '~> 4.0'
Expand Down
2 changes: 1 addition & 1 deletion fluent-plugin-events/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source "https://rubygems.org"

gem 'kubeclient', git: 'https://github.com/ManageIQ/kubeclient', ref: '220b8d7af52180f9a0f69cb73f0723d2618cf3ef'

gemspec
22 changes: 9 additions & 13 deletions fluent-plugin-events/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PATH
remote: .
specs:
fluent-plugin-events (2.0.0)
fluentd (= 1.16.2)
fluentd (= 1.16.5)
net-http-persistent (~> 4.0)

GEM
Expand All @@ -28,9 +28,8 @@ GEM
crack (1.0.0)
bigdecimal
rexml
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
faraday (1.10.0)
domain_name (0.6.20240107)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand All @@ -55,11 +54,11 @@ GEM
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
ffi (1.15.5)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
ffi (1.16.3)
ffi-compiler (1.3.2)
ffi (>= 1.15.5)
rake
fluentd (1.16.2)
fluentd (1.16.5)
bundler
cool.io (>= 1.4.5, < 2.0.0)
http_parser.rb (>= 0.5.1, < 0.9.0)
Expand All @@ -86,7 +85,7 @@ GEM
mocha (2.2.0)
ruby2_keywords (>= 0.0.5)
msgpack (1.5.1)
multipart-post (2.2.3)
multipart-post (2.4.1)
net-http-persistent (4.0.2)
connection_pool (~> 2.2)
power_assert (2.0.3)
Expand All @@ -105,9 +104,6 @@ GEM
concurrent-ruby (~> 1.0)
tzinfo-data (1.2022.1)
tzinfo (>= 1.0.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
webmock (3.23.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
Expand All @@ -128,4 +124,4 @@ DEPENDENCIES
webmock (~> 3.0)

BUNDLED WITH
2.4.1
2.5.10
2 changes: 1 addition & 1 deletion fluent-plugin-events/fluent-plugin-events.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "bundler", "~> 2.0"
spec.add_development_dependency "rake", "~> 13.0"
spec.add_development_dependency "test-unit", "~> 3.0"
spec.add_runtime_dependency "fluentd", "= 1.16.2"
spec.add_runtime_dependency "fluentd", "= 1.16.5"
# spec.add_runtime_dependency 'kubeclient', '4.9.1' # Git version of Kubeclient specified in Gemfile
spec.add_runtime_dependency 'net-http-persistent', '~> 4.0'
spec.add_development_dependency 'webmock', '~> 3.0'
Expand Down
6 changes: 3 additions & 3 deletions fluent-plugin-kubernetes-metadata-filter/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PATH
remote: .
specs:
fluent-plugin-kubernetes-metadata-filter (2.5.3)
fluentd (= 1.16.2)
fluentd (= 1.16.5)
lru_redux
net-http-persistent (~> 4.0)

Expand Down Expand Up @@ -67,7 +67,7 @@ GEM
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
fluentd (1.16.2)
fluentd (1.16.5)
bundler
cool.io (>= 1.4.5, < 2.0.0)
http_parser.rb (>= 0.5.1, < 0.9.0)
Expand Down Expand Up @@ -179,4 +179,4 @@ DEPENDENCIES
yajl-ruby

BUNDLED WITH
2.4.1
2.5.10
2 changes: 1 addition & 1 deletion fluent-plugin-kubernetes-metadata-filter/fluent-plugin-kubernetes-metadata-filter.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |gem|

gem.required_ruby_version = '>= 2.5.0'

gem.add_runtime_dependency "fluentd", "= 1.16.2"
gem.add_runtime_dependency "fluentd", "= 1.16.5"
gem.add_runtime_dependency "lru_redux"
# gem.add_runtime_dependency 'kubeclient', '< 5' # Git version of Kubeclient specified in Gemfile
gem.add_runtime_dependency 'net-http-persistent', '~> 4.0'
Expand Down
6 changes: 3 additions & 3 deletions fluent-plugin-kubernetes-sumologic/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: .
specs:
fluent-plugin-kubernetes-sumologic (2.0.0)
fluentd (= 1.16.2)
fluentd (= 1.16.5)
httpclient (~> 2.8.0)

GEM
Expand All @@ -14,7 +14,7 @@ GEM
cool.io (1.7.1)
crack (0.4.5)
rexml
fluentd (1.16.2)
fluentd (1.16.5)
bundler
cool.io (>= 1.4.5, < 2.0.0)
http_parser.rb (>= 0.5.1, < 0.9.0)
Expand Down Expand Up @@ -62,4 +62,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
2.4.19
2.5.10
2 changes: 1 addition & 1 deletion fluent-plugin-kubernetes-sumologic/fluent-plugin-kubernetes-sumologic.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "bundler", "~> 2"
spec.add_development_dependency "rake"
spec.add_development_dependency 'test-unit', '~> 3.6.0'
spec.add_runtime_dependency "fluentd", "= 1.16.2"
spec.add_runtime_dependency "fluentd", "= 1.16.5"
spec.add_runtime_dependency 'httpclient', '~> 2.8.0'
end
6 changes: 3 additions & 3 deletions fluent-plugin-prometheus-format/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ PATH
remote: .
specs:
fluent-plugin-prometheus-format (2.0.0)
fluentd (= 1.16.2)
fluentd (= 1.16.5)

GEM
remote: https://rubygems.org/
specs:
concurrent-ruby (1.1.10)
cool.io (1.7.1)
fluentd (1.16.2)
fluentd (1.16.5)
bundler
cool.io (>= 1.4.5, < 2.0.0)
http_parser.rb (>= 0.5.1, < 0.9.0)
Expand Down Expand Up @@ -48,4 +48,4 @@ DEPENDENCIES
test-unit (~> 3.0)

BUNDLED WITH
2.4.1
2.5.10
2 changes: 1 addition & 1 deletion fluent-plugin-prometheus-format/fluent-plugin-prometheus-format.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "bundler", "~> 2.0"
spec.add_development_dependency "rake", "~> 13.0"
spec.add_development_dependency "test-unit", "~> 3.0"
spec.add_runtime_dependency "fluentd", "= 1.16.2"
spec.add_runtime_dependency "fluentd", "= 1.16.5"
end
6 changes: 3 additions & 3 deletions fluent-plugin-protobuf/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: .
specs:
fluent-plugin-protobuf (2.0.0)
fluentd (= 1.16.2)
fluentd (= 1.16.5)
google-protobuf (~> 3.17)
snappy (> 0)

Expand All @@ -11,7 +11,7 @@ GEM
specs:
concurrent-ruby (1.1.10)
cool.io (1.7.1)
fluentd (1.16.2)
fluentd (1.16.5)
bundler
cool.io (>= 1.4.5, < 2.0.0)
http_parser.rb (>= 0.5.1, < 0.9.0)
Expand Down Expand Up @@ -52,4 +52,4 @@ DEPENDENCIES
test-unit (~> 3.0)

BUNDLED WITH
2.4.1
2.5.10
2 changes: 1 addition & 1 deletion fluent-plugin-protobuf/fluent-plugin-protobuf.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "test-unit", "~> 3.0"
spec.add_runtime_dependency "google-protobuf", "~> 3.17"
spec.add_runtime_dependency "snappy", "> 0"
spec.add_runtime_dependency "fluentd", "= 1.16.2"
spec.add_runtime_dependency "fluentd", "= 1.16.5"
end
Loading