Skip to content

Commit

Permalink
Merge pull request #93 from yeungda-rea/graceful-shutdown
Browse files Browse the repository at this point in the history 
Graceful shutdown
  • Loading branch information
@repeatedly
repeatedly authored Aug 17, 2017
2 parents 898c35c + 328d5f6 commit e5bc225
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.template.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,4 @@ EXPOSE 24224 5140

ENTRYPOINT ["/bin/entrypoint.sh"]

CMD fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
CMD exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
4 changes: 2 additions & 2 deletions entrypoint.sh.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ chown -R fluent /home/fluent
chown -R fluent /fluentd

<% if is_alpine %>
su-exec fluent "$@"
exec su-exec fluent "$@"
<% else %>
gosu fluent "$@"
exec gosu fluent "$@"
<% end %>
2 changes: 1 addition & 1 deletion v0.12/alpine-onbuild/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ EXPOSE 24224 5140

ENTRYPOINT ["/bin/entrypoint.sh"]

CMD fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
CMD exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
2 changes: 1 addition & 1 deletion v0.12/alpine-onbuild/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ adduser -D -g '' -u ${uid} -h /home/fluent fluent
chown -R fluent /home/fluent
chown -R fluent /fluentd

su-exec fluent "$@"
exec su-exec fluent "$@"
2 changes: 1 addition & 1 deletion v0.12/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ EXPOSE 24224 5140

ENTRYPOINT ["/bin/entrypoint.sh"]

CMD fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
CMD exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
2 changes: 1 addition & 1 deletion v0.12/alpine/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ adduser -D -g '' -u ${uid} -h /home/fluent fluent
chown -R fluent /home/fluent
chown -R fluent /fluentd

su-exec fluent "$@"
exec su-exec fluent "$@"
2 changes: 1 addition & 1 deletion v0.12/debian-onbuild/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ EXPOSE 24224 5140

ENTRYPOINT ["/bin/entrypoint.sh"]

CMD fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
CMD exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
2 changes: 1 addition & 1 deletion v0.12/debian-onbuild/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ export HOME=/home/fluent
chown -R fluent /home/fluent
chown -R fluent /fluentd

gosu fluent "$@"
exec gosu fluent "$@"
2 changes: 1 addition & 1 deletion v0.12/debian/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ EXPOSE 24224 5140

ENTRYPOINT ["/bin/entrypoint.sh"]

CMD fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
CMD exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
2 changes: 1 addition & 1 deletion v0.12/debian/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ export HOME=/home/fluent
chown -R fluent /home/fluent
chown -R fluent /fluentd

gosu fluent "$@"
exec gosu fluent "$@"
2 changes: 1 addition & 1 deletion v0.14/alpine-onbuild/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ EXPOSE 24224 5140

ENTRYPOINT ["/bin/entrypoint.sh"]

CMD fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
CMD exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
2 changes: 1 addition & 1 deletion v0.14/alpine-onbuild/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ adduser -D -g '' -u ${uid} -h /home/fluent fluent
chown -R fluent /home/fluent
chown -R fluent /fluentd

su-exec fluent "$@"
exec su-exec fluent "$@"
2 changes: 1 addition & 1 deletion v0.14/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ EXPOSE 24224 5140

ENTRYPOINT ["/bin/entrypoint.sh"]

CMD fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
CMD exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
2 changes: 1 addition & 1 deletion v0.14/alpine/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ adduser -D -g '' -u ${uid} -h /home/fluent fluent
chown -R fluent /home/fluent
chown -R fluent /fluentd

su-exec fluent "$@"
exec su-exec fluent "$@"
2 changes: 1 addition & 1 deletion v0.14/debian-onbuild/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ EXPOSE 24224 5140

ENTRYPOINT ["/bin/entrypoint.sh"]

CMD fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
CMD exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
2 changes: 1 addition & 1 deletion v0.14/debian-onbuild/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ export HOME=/home/fluent
chown -R fluent /home/fluent
chown -R fluent /fluentd

gosu fluent "$@"
exec gosu fluent "$@"
2 changes: 1 addition & 1 deletion v0.14/debian/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ EXPOSE 24224 5140

ENTRYPOINT ["/bin/entrypoint.sh"]

CMD fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
CMD exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
2 changes: 1 addition & 1 deletion v0.14/debian/entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ export HOME=/home/fluent
chown -R fluent /home/fluent
chown -R fluent /fluentd

gosu fluent "$@"
exec gosu fluent "$@"

0 comments on commit e5bc225

Please sign in to comment.