From a37c8afe02b83e65c6c266986c0136396343d49f Mon Sep 17 00:00:00 2001 From: Giancarlo Rubio Date: Thu, 30 Aug 2018 13:58:14 +0200 Subject: [PATCH] Pass the terminaton signal to fluentd --- .../addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile | 2 +- cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile index ccf2d3812e1..7f84870bd5b 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile @@ -55,4 +55,4 @@ EXPOSE 80 ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1 # Start Fluentd to pick up our config that watches Docker container logs. -CMD /run.sh $FLUENTD_ARGS +CMD ["/run.sh"] diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh index be0011b61d0..275bc733994 100755 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/run.sh @@ -20,4 +20,4 @@ # For systems without journald mkdir -p /var/log/journal -exec /usr/local/bin/fluentd $@ +exec /usr/local/bin/fluentd $FLUENTD_ARGS