diff --git a/.github/workflows/artifacts.yaml b/.github/workflows/artifacts.yaml index 6806a2d..ed5d448 100644 --- a/.github/workflows/artifacts.yaml +++ b/.github/workflows/artifacts.yaml @@ -72,7 +72,7 @@ jobs: target: ${{ matrix.image-type }} - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@0.16.1 + uses: aquasecurity/trivy-action@0.17.0 with: image-ref: "ghcr.io/${{ github.repository_owner }}/fluentd:${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}" format: "sarif" diff --git a/v1.16-ruby3.3/Dockerfile b/v1.16-ruby3.3/Dockerfile index 951dce0..f311826 100644 --- a/v1.16-ruby3.3/Dockerfile +++ b/v1.16-ruby3.3/Dockerfile @@ -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:b44e3526ae59b558576de5695aa5d6b1bdd4e0a080372f0f25d77a4d2092a476 AS sumo +FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:9951b557060243b3acfcfdaa2ab103fe0e64a31bbf38207cabeef9ee9473b1e5 AS sumo FROM ruby:3.3.0-alpine3.18 as base diff --git a/v1.16-ruby3.3/outputs/Gemfile b/v1.16-ruby3.3/outputs/Gemfile index d8712ff..fba1c96 100644 --- a/v1.16-ruby3.3/outputs/Gemfile +++ b/v1.16-ruby3.3/outputs/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'fluent-plugin-aliyun-oss', '0.0.1' -gem 'fluent-plugin-sumologic_output', '1.8.0' +gem 'fluent-plugin-sumologic_output', '1.9.0' gem 'fluent-plugin-kafka', '0.19.2' gem 'fluent-plugin-grafana-loki', '1.2.20' gem 'fluent-plugin-kinesis', '3.4.2' diff --git a/v1.16-ruby3.3/outputs/Gemfile.lock b/v1.16-ruby3.3/outputs/Gemfile.lock index b7fcc63..a6b4838 100644 --- a/v1.16-ruby3.3/outputs/Gemfile.lock +++ b/v1.16-ruby3.3/outputs/Gemfile.lock @@ -150,9 +150,9 @@ GEM aws-sdk-sqs (~> 1) fluentd (>= 0.12.0, < 2) yajl-ruby (~> 1.0) - fluent-plugin-sumologic_output (1.8.0) - fluentd (>= 0.14.12) - httpclient (~> 2.8.0) + fluent-plugin-sumologic_output (1.9.0) + fluentd + httpclient fluent-plugin-vmware-log-intelligence (2.0.8) fluent-plugin-mysqlslowquery (>= 0.0.9) fluentd (>= 0.14.20) @@ -278,7 +278,7 @@ GEM timeout (0.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2023.4) + tzinfo-data (1.2024.1) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext @@ -319,7 +319,7 @@ DEPENDENCIES fluent-plugin-remote-syslog (= 1.1.0) fluent-plugin-splunk-hec (= 1.3.3) fluent-plugin-sqs (= 3.0.0) - fluent-plugin-sumologic_output (= 1.8.0) + 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) diff --git a/v1.16/Dockerfile b/v1.16/Dockerfile index 2281e1c..cce4bc8 100644 --- a/v1.16/Dockerfile +++ b/v1.16/Dockerfile @@ -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:9951b557060243b3acfcfdaa2ab103fe0e64a31bbf38207cabeef9ee9473b1e5 AS sumo -FROM ruby:3.2.3-alpine3.18 as base +FROM ruby:3.3.0-alpine3.18 as base ARG BUILD_DEPS=" \ make gcc g++ libc-dev \ diff --git a/v1.16/outputs/Gemfile b/v1.16/outputs/Gemfile index d8712ff..fba1c96 100644 --- a/v1.16/outputs/Gemfile +++ b/v1.16/outputs/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'fluent-plugin-aliyun-oss', '0.0.1' -gem 'fluent-plugin-sumologic_output', '1.8.0' +gem 'fluent-plugin-sumologic_output', '1.9.0' gem 'fluent-plugin-kafka', '0.19.2' gem 'fluent-plugin-grafana-loki', '1.2.20' gem 'fluent-plugin-kinesis', '3.4.2' diff --git a/v1.16/outputs/Gemfile.lock b/v1.16/outputs/Gemfile.lock index b7fcc63..a6b4838 100644 --- a/v1.16/outputs/Gemfile.lock +++ b/v1.16/outputs/Gemfile.lock @@ -150,9 +150,9 @@ GEM aws-sdk-sqs (~> 1) fluentd (>= 0.12.0, < 2) yajl-ruby (~> 1.0) - fluent-plugin-sumologic_output (1.8.0) - fluentd (>= 0.14.12) - httpclient (~> 2.8.0) + fluent-plugin-sumologic_output (1.9.0) + fluentd + httpclient fluent-plugin-vmware-log-intelligence (2.0.8) fluent-plugin-mysqlslowquery (>= 0.0.9) fluentd (>= 0.14.20) @@ -278,7 +278,7 @@ GEM timeout (0.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2023.4) + tzinfo-data (1.2024.1) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext @@ -319,7 +319,7 @@ DEPENDENCIES fluent-plugin-remote-syslog (= 1.1.0) fluent-plugin-splunk-hec (= 1.3.3) fluent-plugin-sqs (= 3.0.0) - fluent-plugin-sumologic_output (= 1.8.0) + 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)