fluentd: Update to Fluentd v1.16.6/v1.17.1 #17396

kenhys · 2024-08-20T06:49:26Z

v1.16.x: stable branch (bundled for fluent-package LTS)

fluent/fluentd-docker-image@ddb5019

v1.17.x: latest branch

fluent/fluentd-docker-image@1055e52

tianon · 2024-08-20T18:18:56Z

Relevant to #15468 (comment), how do we make sure this gets updated with more regularity? Is there some way we can assist? Is it intentional that we're not adding 1.17?

cc @ashie @cosmo0920 (other "recent" PR authors for library/fluentd ❤️)

library/fluentd

v1.16.x: stable branch (bundled for fluent-package LTS) v1.17.x: latest branch Signed-off-by: Kentaro Hayashi <[email protected]>

github-actions · 2024-08-23T02:59:49Z

Diff for f78bb52:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9016d82..734bb4d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,12 +1,24 @@
 Maintainers: Masahiro Nakagawa <[email protected]> (@repeatedly), Fluentd developers <[email protected]> (@fluent/admins)
 GitRepo: https://github.com/fluent/fluentd-docker-image.git
 
-Tags: v1.16.2-1.1, v1.16-1, latest
+Tags: v1.16.6-1.0, v1.16-1
 Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
-GitCommit: a4dd65768ec1819574e570716955276c9089326a
+GitFetch: refs/heads/v1.16
+GitCommit: ddb5019b433339f9eef991ca373445deb6e4d2b1
 Directory: v1.16/alpine
 
-Tags: v1.16.2-debian-1.1, v1.16-debian-1
+Tags: v1.16.6-debian-1.0, v1.16-debian-1
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: a4dd65768ec1819574e570716955276c9089326a
+GitFetch: refs/heads/v1.16
+GitCommit: ddb5019b433339f9eef991ca373445deb6e4d2b1
 Directory: v1.16/debian
+
+Tags: v1.17.1-1.0, v1.17-1, latest
+Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
+GitCommit: 1055e528ef1acbb073028e0281b60bdaf9a23595
+Directory: v1.17/alpine
+
+Tags: v1.17.1-debian-1.0, v1.17-debian-1
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 1055e528ef1acbb073028e0281b60bdaf9a23595
+Directory: v1.17/debian
diff --git a/_bashbrew-list b/_bashbrew-list
index 134509e..25beb0b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,5 +1,9 @@
 fluentd:latest
 fluentd:v1.16-1
 fluentd:v1.16-debian-1
-fluentd:v1.16.2-1.1
-fluentd:v1.16.2-debian-1.1
+fluentd:v1.16.6-1.0
+fluentd:v1.16.6-debian-1.0
+fluentd:v1.17-1
+fluentd:v1.17-debian-1
+fluentd:v1.17.1-1.0
+fluentd:v1.17.1-debian-1.0
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 2aa684f..d52fa09 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,2 +1,4 @@
 fluentd:latest
+fluentd:v1.16-1
 fluentd:v1.16-debian-1
+fluentd:v1.17-debian-1
diff --git a/fluentd_latest/Dockerfile b/fluentd_latest/Dockerfile
index 25d35ad..ab417b1 100644
--- a/fluentd_latest/Dockerfile
+++ b/fluentd_latest/Dockerfile
@@ -1,9 +1,9 @@
 # AUTOMATICALLY GENERATED
 # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.template.erb
 
-FROM alpine:3.17
+FROM alpine:3.19
 LABEL maintainer "Fluentd developers <[email protected]>"
-LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2"
+LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.1"
 
 # Do not split this into multiple RUN!
 # Docker creates a layer for every RUN-Statement
@@ -17,16 +17,15 @@ RUN apk update \
         build-base linux-headers \
         ruby-dev gnupg \
  && echo 'gem: --no-document' >> /etc/gemrc \
- && gem install oj -v 3.16.1 \
- && gem install json -v 2.6.3 \
- && gem install rexml -v 3.2.6 \
- && gem install async -v 1.31.0 \
- && gem install async-http -v 0.60.2 \
-# CVE-2023-36617
-&& gem install uri -v 0.12.2 \
- && gem install fluentd -v 1.16.2 \
+ && gem install oj -v 3.16.5 \
+ && gem install json -v 2.7.2 \
+ && gem install rexml -v 3.3.5 \
+ && gem install async -v 1.32.1 \
+ && gem install async-http -v 0.64.2 \
+ && gem install fluentd -v 1.17.1 \
  && gem install bigdecimal -v 1.4.4 \
  && apk del .build-deps \
+ && rm -rf /var/cache/apk/* \
  && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
 
 RUN addgroup -S fluent && adduser -S -G fluent fluent \
diff --git a/fluentd_latest/Dockerfile b/fluentd_v1.16-1/Dockerfile
similarity index 92%
copy from fluentd_latest/Dockerfile
copy to fluentd_v1.16-1/Dockerfile
index 25d35ad..fb3afb9 100644
--- a/fluentd_latest/Dockerfile
+++ b/fluentd_v1.16-1/Dockerfile
@@ -1,9 +1,9 @@
 # AUTOMATICALLY GENERATED
 # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.template.erb
 
-FROM alpine:3.17
+FROM alpine:3.19
 LABEL maintainer "Fluentd developers <[email protected]>"
-LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2"
+LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"
 
 # Do not split this into multiple RUN!
 # Docker creates a layer for every RUN-Statement
@@ -22,11 +22,10 @@ RUN apk update \
  && gem install rexml -v 3.2.6 \
  && gem install async -v 1.31.0 \
  && gem install async-http -v 0.60.2 \
-# CVE-2023-36617
-&& gem install uri -v 0.12.2 \
- && gem install fluentd -v 1.16.2 \
+ && gem install fluentd -v 1.16.6 \
  && gem install bigdecimal -v 1.4.4 \
  && apk del .build-deps \
+ && rm -rf /var/cache/apk/* \
  && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
 
 RUN addgroup -S fluent && adduser -S -G fluent fluent \
diff --git a/fluentd_latest/entrypoint.sh b/fluentd_v1.16-1/entrypoint.sh
similarity index 100%
copy from fluentd_latest/entrypoint.sh
copy to fluentd_v1.16-1/entrypoint.sh
diff --git a/fluentd_latest/fluent.conf b/fluentd_v1.16-1/fluent.conf
similarity index 100%
copy from fluentd_latest/fluent.conf
copy to fluentd_v1.16-1/fluent.conf
diff --git a/fluentd_v1.16-debian-1/Dockerfile b/fluentd_v1.16-debian-1/Dockerfile
index c2fb8f3..197d60a 100644
--- a/fluentd_v1.16-debian-1/Dockerfile
+++ b/fluentd_v1.16-debian-1/Dockerfile
@@ -1,9 +1,9 @@
 # AUTOMATICALLY GENERATED
 # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.template.erb
 
-FROM ruby:3.1-slim-bullseye
+FROM ruby:3.2-slim-bookworm
 LABEL maintainer "Fluentd developers <[email protected]>"
-LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2"
+LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.6"
 ENV TINI_VERSION=0.18.0
 
 # Do not split this into multiple RUN!
@@ -23,9 +23,7 @@ RUN apt-get update \
  && gem install rexml -v 3.2.6 \
  && gem install async -v 1.31.0 \
  && gem install async-http -v 0.60.2 \
-# CVE-2023-36617
-&& gem install uri -v 0.12.2 \
- && gem install fluentd -v 1.16.2 \
+ && gem install fluentd -v 1.16.6 \
  && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
  && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch" \
  && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc" \
@@ -36,7 +34,7 @@ RUN apt-get update \
  && chmod +x /usr/local/bin/tini \
  && tini -h \
  && wget -O /tmp/jemalloc-5.3.0.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 \
- && cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 && cd jemalloc-5.3.0/ \
+ && cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 --no-same-owner && cd jemalloc-5.3.0/ \
  # Don't use MADV_FREE to reduce memory usage and improve stability
  # https://github.com/fluent/fluentd-docker-image/pull/350
  && (echo "je_cv_madv_free=no" > config.cache) && ./configure -C && make \
@@ -44,6 +42,7 @@ RUN apt-get update \
  && apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
  && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
 
diff --git a/fluentd_v1.16-debian-1/Dockerfile b/fluentd_v1.17-debian-1/Dockerfile
similarity index 86%
copy from fluentd_v1.16-debian-1/Dockerfile
copy to fluentd_v1.17-debian-1/Dockerfile
index c2fb8f3..4a245d1 100644
--- a/fluentd_v1.16-debian-1/Dockerfile
+++ b/fluentd_v1.17-debian-1/Dockerfile
@@ -1,9 +1,9 @@
 # AUTOMATICALLY GENERATED
 # DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.template.erb
 
-FROM ruby:3.1-slim-bullseye
+FROM ruby:3.2-slim-bookworm
 LABEL maintainer "Fluentd developers <[email protected]>"
-LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.16.2"
+LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.1"
 ENV TINI_VERSION=0.18.0
 
 # Do not split this into multiple RUN!
@@ -18,14 +18,12 @@ RUN apt-get update \
     " \
  && apt-get install -y --no-install-recommends $buildDeps \
  && echo 'gem: --no-document' >> /etc/gemrc \
- && gem install oj -v 3.16.1 \
- && gem install json -v 2.6.3 \
- && gem install rexml -v 3.2.6 \
- && gem install async -v 1.31.0 \
- && gem install async-http -v 0.60.2 \
-# CVE-2023-36617
-&& gem install uri -v 0.12.2 \
- && gem install fluentd -v 1.16.2 \
+ && gem install oj -v 3.16.5 \
+ && gem install json -v 2.7.2 \
+ && gem install rexml -v 3.3.5 \
+ && gem install async -v 1.32.1 \
+ && gem install async-http -v 0.64.2 \
+ && gem install fluentd -v 1.17.1 \
  && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
  && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch" \
  && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-$dpkgArch.asc" \
@@ -36,7 +34,7 @@ RUN apt-get update \
  && chmod +x /usr/local/bin/tini \
  && tini -h \
  && wget -O /tmp/jemalloc-5.3.0.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 \
- && cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 && cd jemalloc-5.3.0/ \
+ && cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 --no-same-owner && cd jemalloc-5.3.0/ \
  # Don't use MADV_FREE to reduce memory usage and improve stability
  # https://github.com/fluent/fluentd-docker-image/pull/350
  && (echo "je_cv_madv_free=no" > config.cache) && ./configure -C && make \
@@ -44,6 +42,7 @@ RUN apt-get update \
  && apt-get purge -y --auto-remove \
                   -o APT::AutoRemove::RecommendsImportant=false \
                   $buildDeps \
+                  '*-dev' \
  && rm -rf /var/lib/apt/lists/* \
  && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
 
diff --git a/fluentd_latest/entrypoint.sh b/fluentd_v1.17-debian-1/entrypoint.sh
similarity index 100%
copy from fluentd_latest/entrypoint.sh
copy to fluentd_v1.17-debian-1/entrypoint.sh
diff --git a/fluentd_latest/fluent.conf b/fluentd_v1.17-debian-1/fluent.conf
similarity index 100%
copy from fluentd_latest/fluent.conf
copy to fluentd_v1.17-debian-1/fluent.conf

Relevant Maintainers:

fluentd: @repeatedly @fluent/admins

tianon

This looks good and is definitely an improvement so I'm going to go ahead and merge, but I'd still like to know more about how we can make sure this keeps getting updated actively in the future. ❤️

kenhys requested a review from a team as a code owner August 20, 2024 06:49

github-actions bot added the library/fluentd label Aug 20, 2024

This comment has been minimized.

Sign in to view

kenhys force-pushed the fluentd-v1.16.5 branch from 5ecb8eb to d562bac Compare August 22, 2024 05:17

kenhys changed the title ~~fluentd: Update to Fluentd v1.16.5~~ fluentd: Update to Fluentd v1.16.6/v1.17.1 Aug 22, 2024

kenhys force-pushed the fluentd-v1.16.5 branch from d562bac to a419f25 Compare August 22, 2024 05:22

This comment has been minimized.

Sign in to view

yosifkit reviewed Aug 22, 2024

View reviewed changes

library/fluentd Show resolved Hide resolved

fluentd: Update to Fluentd v1.16.6/v1.17.1

f78bb52

v1.16.x: stable branch (bundled for fluent-package LTS) v1.17.x: latest branch Signed-off-by: Kentaro Hayashi <[email protected]>

kenhys force-pushed the fluentd-v1.16.5 branch from a419f25 to f78bb52 Compare August 23, 2024 02:58

tianon approved these changes Aug 23, 2024

View reviewed changes

tianon merged commit f464cd2 into docker-library:master Aug 23, 2024
9 checks passed

kenhys deleted the fluentd-v1.16.5 branch August 24, 2024 12:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fluentd: Update to Fluentd v1.16.6/v1.17.1 #17396

fluentd: Update to Fluentd v1.16.6/v1.17.1 #17396

kenhys commented Aug 20, 2024 •

edited

Loading

This comment has been minimized.

tianon commented Aug 20, 2024

This comment has been minimized.

github-actions bot commented Aug 23, 2024

tianon left a comment

fluentd: Update to Fluentd v1.16.6/v1.17.1 #17396

fluentd: Update to Fluentd v1.16.6/v1.17.1 #17396

Conversation

kenhys commented Aug 20, 2024 • edited Loading

This comment has been minimized.

tianon commented Aug 20, 2024

This comment has been minimized.

github-actions bot commented Aug 23, 2024

tianon left a comment

Choose a reason for hiding this comment

kenhys commented Aug 20, 2024 •

edited

Loading