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 Dockerfile fluentd to v1.6.2 #87

Merged
merged 1 commit into from
Jul 24, 2019
Merged

Upgrade Dockerfile fluentd to v1.6.2 #87

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions deploy/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluent/fluentd:v1.4.2-onbuild-1.0
FROM fluent/fluentd:v1.6.2-1.0

# Use root account to use apk
USER root
Expand Down Expand Up @@ -64,6 +64,7 @@ ENV VERIFY_SSL "true"

RUN mkdir -p /fluentd/conf.d

COPY ./fluent.conf /fluentd/conf.d/fluent.conf
COPY ./fluent.conf /fluentd/etc/
COPY entrypoint.sh /bin/
Copy link
Contributor

Choose a reason for hiding this comment

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

should we test this with a local image first to see if helps with the current bug? or do you think we should upgrade regardless?

Copy link
Contributor

Choose a reason for hiding this comment

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

What are we trying to do here with the upgrade? Is this an alpine or debian build? I remember we had some issue with debian build

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I'm testing currently to see if it helps with the other issue. But I think we should merge this regardless. I have verified fluentd is starting correctly.

@lei-sumo We're upgrading to the latest release of the Alpine docker image from FluentD, since there have been some bug fixes since 1.4.2: https://github.com/fluent/fluentd/blob/master/CHANGELOG.md


USER fluent
28 changes: 28 additions & 0 deletions deploy/docker/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/sh

#source vars if file exists
DEFAULT=/etc/default/fluentd

if [ -r $DEFAULT ]; then
set -o allexport
. $DEFAULT
set +o allexport
fi

# If the user has supplied only arguments append them to `fluentd` command
if [ "${1#-}" != "$1" ]; then
set -- fluentd "$@"
fi

# If user does not supply config file or plugins, use the default
if [ "$1" = "fluentd" ]; then
if ! echo $@ | grep ' \-c' ; then
set -- "$@" -c /fluentd/etc/${FLUENTD_CONF}
fi

if ! echo $@ | grep ' \-p' ; then
set -- "$@" -p /fluentd/plugins
fi
fi

exec "$@"