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

Jump to bottom

Upgrade fluentd to 1.17.0. #1198

Merged
merged 1 commit into from
Jun 12, 2024
Merged

Upgrade fluentd to 1.17.0. #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions cmd/fluent-watcher/fluentd/Dockerfile.amd64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cm

# Fluentd main image
FROM alpine:3.19
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.15.3"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.0"

# Do not split this into multiple RUN!
# Docker creates a layer for every RUN-Statement
Expand All @@ -27,7 +27,7 @@ RUN apk update \
&& gem install json -v 2.6.2 \
&& gem install async -v 1.30.3 \
&& gem install async-http -v 0.56.6 \
&& gem install fluentd -v 1.15.3 \
&& gem install fluentd -v 1.17.0 \
&& gem install bigdecimal -v 1.4.4 \
# NOTE: resolv v0.2.1 includes the fix for CPU spike issue due to DNS resolver.
# This hack is needed for Ruby 2.6.7, 2.7.3 and 3.0.1. (alpine image is still kept on 2.7.3)
Expand Down
4 changes: 2 additions & 2 deletions cmd/fluent-watcher/fluentd/Dockerfile.arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/q
# Fluentd main image
FROM arm64v8/ruby:3.3-slim-bullseye
COPY --from=builderqemu /go/qemu-aarch64-static /usr/bin/
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.15.3"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.0"
ENV TINI_VERSION=0.18.0

# Do not split this into multiple RUN!
Expand All @@ -37,7 +37,7 @@ RUN apt-get update \
&& gem install rexml -v 3.2.5 \
&& gem install async -v 1.30.3 \
&& gem install async-http -v 0.56.6 \
&& gem install fluentd -v 1.15.3 \
&& gem install fluentd -v 1.17.0 \
&& gem install bigdecimal -v 1.4.4 \
&& gem install resolv -v 0.2.1 \
&& gem install elasticsearch -v 7.13.3 \
Expand Down
2 changes: 1 addition & 1 deletion cmd/fluent-watcher/fluentd/Dockerfile.arm64.base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/q
# Fluentd main image
FROM arm64v8/ruby:3.3-slim-bullseye
COPY --from=builderqemu /go/qemu-aarch64-static /usr/bin/
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.15.3"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.0"
ENV TINI_VERSION=0.18.0

# Do not split this into multiple RUN!
Expand Down
2 changes: 1 addition & 1 deletion cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN buildDeps=" \
make gcc g++ libc-dev \
wget bzip2 gnupg dirmngr\
" \
&& gem install fluentd -v 1.15.3 \
&& gem install fluentd -v 1.17.0 \
&& apt-get purge -y --auto-remove \
-o APT::AutoRemove::RecommendsImportant=false \
$buildDeps \
Expand Down
4 changes: 2 additions & 2 deletions cmd/fluent-watcher/fluentd/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.template.erb

FROM alpine:3.17.3
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.15.3"
LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.17.0"

# Do not split this into multiple RUN!
# Docker creates a layer for every RUN-Statement
Expand All @@ -21,7 +21,7 @@ RUN apk update \
&& gem install rexml -v 3.2.5 \
&& gem install async -v 1.30.3 \
&& gem install async-http -v 0.56.6 \
&& gem install fluentd -v 1.15.3 \
&& gem install fluentd -v 1.17.0 \
&& gem install bigdecimal -v 1.4.4 \
# NOTE: resolv v0.2.1 includes the fix for CPU spike issue due to DNS resolver.
# This hack is needed for Ruby 2.6.7, 2.7.3 and 3.0.1. (alpine image is still kept on 2.7.3)
Expand Down
Loading