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.

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

chore(deps): update all dependencies #137

Merged
merged 2 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
target: ${{ matrix.image-type }}

- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.22.0
uses: aquasecurity/trivy-action@0.23.0
with:
image-ref: "ghcr.io/${{ github.repository_owner }}/fluentd:${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}"
format: "sarif"
Expand Down
6 changes: 3 additions & 3 deletions v1.16-4.8/outputs/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ gem 'fluent-plugin-grafana-loki', '1.2.20'
gem 'fluent-plugin-kinesis', '3.5.0'
gem 'fluent-plugin-splunk-hec', '1.3.3'
gem 'fluent-plugin-elasticsearch', '5.4.3'
gem 'fluent-plugin-newrelic', '1.2.2'
gem 'fluent-plugin-newrelic', '1.2.3'
gem 'fluent-plugin-cloudwatch-logs', '0.14.3'
gem 'fluent-plugin-opensearch', '1.1.4'
gem 'fluent-plugin-logzio', '0.2.2'
gem 'fluent-plugin-datadog', '0.14.2'
gem 'fluent-plugin-datadog', '0.14.3'
gem 'fluent-plugin-redis', '0.3.5'
gem 'fluent-plugin-sqs', '3.0.0'
gem 'fluent-plugin-mattermost', '0.2.2'
gem 'fluent-plugin-remote-syslog', '1.1.0'
gem 'fluent-plugin-webhdfs', '1.5.0'
gem 'fluent-plugin-webhdfs', '1.6.0'
gem 'fluent-plugin-vmware-loginsight', '1.4.2'
gem 'fluent-plugin-vmware-log-intelligence', '2.0.8'
gem 'fluent-plugin-gelf-best', '1.3.3'
Expand Down
19 changes: 11 additions & 8 deletions v1.16-4.8/outputs/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ GEM
fluent-plugin-cloudwatch-logs (0.14.3)
aws-sdk-cloudwatchlogs (~> 1.0)
fluentd (>= 1.8.0)
fluent-plugin-datadog (0.14.2)
fluent-plugin-datadog (0.14.3)
fluentd (>= 1, < 2)
net-http-persistent (~> 4.0.1)
fluent-plugin-elasticsearch (5.4.3)
Expand Down Expand Up @@ -120,7 +120,7 @@ GEM
fluent-plugin-mysqlslowquery (0.0.9)
fluentd (>= 0.12.0, < 2)
myslog (~> 0.0)
fluent-plugin-newrelic (1.2.2)
fluent-plugin-newrelic (1.2.3)
fluentd (>= 1.0.0)
fluent-plugin-opensearch (1.1.4)
aws-sdk-core (~> 3)
Expand Down Expand Up @@ -159,9 +159,9 @@ GEM
myslog (~> 0.0)
fluent-plugin-vmware-loginsight (1.4.2)
fluentd (>= 0.14.10, < 2)
fluent-plugin-webhdfs (1.5.0)
fluent-plugin-webhdfs (1.6.0)
fluentd (>= 0.14.22)
webhdfs (>= 0.10.0)
webhdfs (>= 0.11.0)
fluentd (1.16.3)
bundler
cool.io (>= 1.4.5, < 2.0.0)
Expand Down Expand Up @@ -293,7 +293,7 @@ GEM
activesupport
faraday (~> 2.0)
faraday-follow_redirects
webhdfs (0.10.2)
webhdfs (0.11.0)
addressable
webrick (1.8.1)
yajl-ruby (1.4.3)
Expand All @@ -304,15 +304,15 @@ PLATFORMS
DEPENDENCIES
fluent-plugin-aliyun-oss (= 0.0.1)
fluent-plugin-cloudwatch-logs (= 0.14.3)
fluent-plugin-datadog (= 0.14.2)
fluent-plugin-datadog (= 0.14.3)
fluent-plugin-elasticsearch (= 5.4.3)
fluent-plugin-gelf-best (= 1.3.3)
fluent-plugin-grafana-loki (= 1.2.20)
fluent-plugin-kafka (= 0.19.2)
fluent-plugin-kinesis (= 3.5.0)
fluent-plugin-logzio (= 0.2.2)
fluent-plugin-mattermost (= 0.2.2)
fluent-plugin-newrelic (= 1.2.2)
fluent-plugin-newrelic (= 1.2.3)
fluent-plugin-opensearch (= 1.1.4)
fluent-plugin-redis (= 0.3.5)
fluent-plugin-remote-syslog (= 1.1.0)
Expand All @@ -321,4 +321,7 @@ DEPENDENCIES
fluent-plugin-sumologic_output (= 1.9.0)
fluent-plugin-vmware-log-intelligence (= 2.0.8)
fluent-plugin-vmware-loginsight (= 1.4.2)
fluent-plugin-webhdfs (= 1.5.0)
fluent-plugin-webhdfs (= 1.6.0)

BUNDLED WITH
2.5.13
2 changes: 1 addition & 1 deletion v1.16-ruby3.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# https://github.com/SumoLogic/sumologic-kubernetes-fluentd/blob/main/alpine.Dockerfile
# TODO every time the base image is changed please make sure BASEIMAGEDEPS is updated (further down in this file)
FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:683d1d89027abfc453653e25ca3828a8c73e660a06fcea74fe37833a5c321dee AS sumo
FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:23f6ab7e7bb89d25e950770d2729d1628bd0618693e5fdee2382760254a48ecb AS sumo

FROM ruby:3.3.1-alpine3.18 as base

Expand Down
4 changes: 2 additions & 2 deletions v1.16/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# TODO every time the base image is changed please make sure BASEIMAGEDEPS is updated (further down in this file)
FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:b44e3526ae59b558576de5695aa5d6b1bdd4e0a080372f0f25d77a4d2092a476 AS sumo
FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:23f6ab7e7bb89d25e950770d2729d1628bd0618693e5fdee2382760254a48ecb AS sumo
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:23f6ab7e7bb89d25e950770d2729d1628bd0618693e5fdee2382760254a48ecb AS sumo
FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:b44e3526ae59b558576de5695aa5d6b1bdd4e0a080372f0f25d77a4d2092a476 AS sumo


FROM ruby:3.2.4-alpine3.18 as base
FROM ruby:3.3.1-alpine3.18 as base
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM ruby:3.3.1-alpine3.18 as base
FROM ruby:3.2.4-alpine3.18 as base


ARG BUILD_DEPS=" \
make gcc g++ libc-dev \
Expand Down