-
Notifications
You must be signed in to change notification settings - Fork 2.4k
fluentd: Update to v1.19.0 #19571
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
Open
kenhys
wants to merge
1
commit into
docker-library:master
Choose a base branch
from
kenhys:fluentd-v1.19.0
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
fluentd: Update to v1.19.0 #19571
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
tianon
reviewed
Jul 31, 2025
NOTE: Since v1.19.0, alpine will not shipped anymore, so alpine target was removed. Signed-off-by: Kentaro Hayashi <[email protected]>
Diff for 7d6920c:diff --git a/_bashbrew-cat b/_bashbrew-cat
index ddf9412..f7f16fa 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -13,12 +13,7 @@ GitFetch: refs/heads/v1.16
GitCommit: 505a1af75b4a4adb40d576df7b18cebab853264e
Directory: v1.16/debian
-Tags: v1.18.0-1.0, v1.18-1, latest
-Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
-GitCommit: 0c3c82df3ec08a46ba346e53c4644cfc667dc703
-Directory: v1.18/alpine
-
-Tags: v1.18.0-debian-1.0, v1.18-debian-1
+Tags: v1.19.0-debian-1.0, v1.19-debian-1, v1.19.0-1.0, v1.19-1, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0c3c82df3ec08a46ba346e53c4644cfc667dc703
-Directory: v1.18/debian
+GitCommit: 42a0afa30b3821482bce1ba8e67266d745619724
+Directory: v1.19/debian
diff --git a/_bashbrew-list b/_bashbrew-list
index 6c0e5e7..cad06c4 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -3,7 +3,7 @@ fluentd:v1.16-1
fluentd:v1.16-debian-1
fluentd:v1.16.9-1.0
fluentd:v1.16.9-debian-1.0
-fluentd:v1.18-1
-fluentd:v1.18-debian-1
-fluentd:v1.18.0-1.0
-fluentd:v1.18.0-debian-1.0
+fluentd:v1.19-1
+fluentd:v1.19-debian-1
+fluentd:v1.19.0-1.0
+fluentd:v1.19.0-debian-1.0
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 31567f0..4cc7952 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,4 +1,3 @@
fluentd:latest
fluentd:v1.16-1
fluentd:v1.16-debian-1
-fluentd:v1.18-debian-1
diff --git a/fluentd_latest/Dockerfile b/fluentd_latest/Dockerfile
index 9a2ed9e..ee55b4e 100644
--- a/fluentd_latest/Dockerfile
+++ b/fluentd_latest/Dockerfile
@@ -1,40 +1,49 @@
# AUTOMATICALLY GENERATED
# DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.template.erb
-FROM alpine:3.19
+FROM ruby:3.4-slim
LABEL maintainer "Fluentd developers <[email protected]>"
-LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.18.0"
+LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.19.0"
# Do not split this into multiple RUN!
# Docker creates a layer for every RUN-Statement
-# therefore an 'apk delete' has no effect
-RUN apk update \
- && apk add --no-cache \
- ca-certificates \
- ruby ruby-irb ruby-etc ruby-webrick \
- tini \
- && apk add --no-cache --virtual .build-deps \
- build-base linux-headers \
- ruby-dev gnupg \
+# therefore an 'apt-get purge' has no effect
+RUN apt-get update \
+ && apt-get install -y --no-install-recommends \
+ ca-certificates tini \
+ && buildDeps=" \
+ make gcc g++ libc-dev \
+ wget bzip2 gnupg dirmngr \
+ " \
+ && apt-get install -y --no-install-recommends $buildDeps \
&& echo 'gem: --no-document' >> /etc/gemrc \
- && gem install oj -v 3.16.5 \
- && gem install json -v 2.7.4 \
- && gem install rexml -v 3.3.9 \
- && gem install async -v 1.32.1 \
- && gem install async-http -v 0.64.2 \
- && gem install fluentd -v 1.18.0 \
+ && gem install oj -v 3.16.11 \
+ && gem install json -v 2.13.2 \
+ && gem install rexml -v 3.4.1 \
+ && gem install async -v 2.24.0 \
+ && gem install async-http -v 0.89.0 \
+ && gem install fluentd -v 1.19.0 \
&& export GEM_DIR=$(ruby -e 'puts Gem.dir') \
&& echo GEM_DIR=$GEM_DIR \
&& rm -rf $GEM_DIR/cache/*.gem \
# Don't purge $GEM_DIR/gems/GEM/lib/GEM/ext because it might contain runtime .so (e.g json)
&& find $GEM_DIR -maxdepth 3 -type d -name test -or -name ext -or -name spec -or -name benchmark | xargs -r rm -rfv \
&& find $GEM_DIR -name "*.so" | xargs -r strip \
- && gem install bigdecimal -v 1.4.4 \
- && apk del .build-deps \
- && rm -rf /var/cache/apk/* \
+ && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \
+ && 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 --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 \
+ && mv lib/libjemalloc.so.2 /usr/lib \
+ && apt-get purge -y --auto-remove \
+ -o APT::AutoRemove::RecommendsImportant=false \
+ $buildDeps \
+ '*-dev' \
+ && rm -rf /var/lib/apt/lists/* \
&& rm -rf /tmp/* /var/tmp/*
-RUN addgroup -S fluent && adduser -S -G fluent fluent \
+RUN groupadd -r fluent && useradd -r -g fluent fluent \
# for log storage (maybe shared with host)
&& mkdir -p /fluentd/log \
# configuration/plugins path (default: copied from .)
@@ -48,7 +57,7 @@ COPY entrypoint.sh /bin/
ENV FLUENTD_CONF="fluent.conf"
-ENV LD_PRELOAD=""
+ENV LD_PRELOAD="/usr/lib/libjemalloc.so.2"
EXPOSE 24224 5140
USER fluent
diff --git a/fluentd_v1.18-debian-1/Dockerfile b/fluentd_v1.18-debian-1/Dockerfile
deleted file mode 100644
index ca5e112..0000000
diff --git a/fluentd_v1.18-debian-1/entrypoint.sh b/fluentd_v1.18-debian-1/entrypoint.sh
deleted file mode 100755
index d0f6b25..0000000
diff --git a/fluentd_v1.18-debian-1/fluent.conf b/fluentd_v1.18-debian-1/fluent.conf
deleted file mode 100644
index 24a37b5..0000000 Relevant Maintainers:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
NOTE: Since v1.19.0, alpine will not shipped anymore, so alpine target was removed.