fix: cleanup entrypoint
This commit is contained in:
parent
4db7ec9404
commit
ad5bbc0089
@ -36,6 +36,7 @@ COPY fluent.conf /fluentd/etc/
|
||||
COPY entrypoint.sh /bin/
|
||||
|
||||
ENV FLUENTD_CONF="fluent.conf"
|
||||
ENV FLUENTD_OPT=""
|
||||
|
||||
ENV LD_PRELOAD=""
|
||||
|
||||
|
@ -1,14 +1,5 @@
|
||||
#!/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 "$@"
|
||||
@ -28,6 +19,8 @@ if [ "$1" = "fluentd" ]; then
|
||||
if [ -n "$SIMPLE_SNIFFER" -a -f "$SIMPLE_SNIFFER" ] ; then
|
||||
set -- "$@" -r $SIMPLE_SNIFFER
|
||||
fi
|
||||
|
||||
set -- "$@" --gemfile /fluentd/Gemfile
|
||||
fi
|
||||
|
||||
exec "$@"
|
||||
exec "$@" ${FLUENTD_OPT}
|
||||
|
Loading…
Reference in New Issue
Block a user