[nifi] branch master updated: NIFI-7318 - Allow 'docker stop' to gracefully shutdown

[pvillard]

This is an automated email from the ASF dual-hosted git repository.

pvillard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new 99e69f0  NIFI-7318 - Allow 'docker stop' to gracefully shutdown
99e69f0 is described below

commit 99e69f0252ad727a187f2218fa9ca6a84782b5c2
Author: Opher Shachar <oph...@users.noreply.github.com>
AuthorDate: Sat Apr 4 15:50:24 2020 +0300

    NIFI-7318 - Allow 'docker stop' to gracefully shutdown
    
    As it is issuing 'docker stop' will immediatly exit the container.
    
    Signed-off-by: Pierre Villard <pierre.villard...@gmail.com>
    
    This closes #4182.
---
 nifi-docker/dockerhub/sh/start.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nifi-docker/dockerhub/sh/start.sh 
b/nifi-docker/dockerhub/sh/start.sh
index bd67c27..e4bc79a 100755
--- a/nifi-docker/dockerhub/sh/start.sh
+++ b/nifi-docker/dockerhub/sh/start.sh
@@ -87,11 +87,12 @@ case ${AUTH} in
 esac
 
 # Continuously provide logs so that 'docker logs' can    produce them
-tail -F "${NIFI_HOME}/logs/nifi-app.log" &
 "${NIFI_HOME}/bin/nifi.sh" run &
 nifi_pid="$!"
+tail -F --pid=${nifi_pid} "${NIFI_HOME}/logs/nifi-app.log" &
 
-trap "echo Received trapped signal, beginning shutdown...;" KILL TERM HUP INT 
EXIT;
+trap 'echo Received trapped signal, beginning shutdown...;./bin/nifi.sh 
stop;exit 0;' TERM HUP INT;
+trap ":" EXIT
 
 echo NiFi running with PID ${nifi_pid}.
 wait ${nifi_pid}