From ad5bbc0089f84b5594a370ea0d6003e25a37fea9 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Wed, 13 Dec 2023 17:54:52 +0000
Subject: [PATCH] fix: cleanup entrypoint

---
 Dockerfile    |  1 +
 entrypoint.sh | 13 +++----------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b9c4088..a62ff5b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,6 +36,7 @@ COPY fluent.conf /fluentd/etc/
 COPY entrypoint.sh /bin/
 
 ENV FLUENTD_CONF="fluent.conf"
+ENV FLUENTD_OPT=""
 
 ENV LD_PRELOAD=""
 
diff --git a/entrypoint.sh b/entrypoint.sh
index 6d3bfdb..f02a74e 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -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}