You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by be...@apache.org on 2023/12/09 13:58:02 UTC

(nifi) branch main updated: NIFI-12490 MiNiFi docker graceful shutdown

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

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


The following commit(s) were added to refs/heads/main by this push:
     new c55d600d0a NIFI-12490 MiNiFi docker graceful shutdown
c55d600d0a is described below

commit c55d600d0aefca22c2794b5b16de813f3e123820
Author: Ferenc Kis <br...@gmail.com>
AuthorDate: Thu Dec 7 17:02:07 2023 +0100

    NIFI-12490 MiNiFi docker graceful shutdown
    
    Signed-off-by: Csaba Bejan <be...@gmail.com>
    
    This closes #8145.
---
 minifi/minifi-docker/dockerhub/sh/start.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/minifi/minifi-docker/dockerhub/sh/start.sh b/minifi/minifi-docker/dockerhub/sh/start.sh
index f1f19f9467..e93e71e534 100755
--- a/minifi/minifi-docker/dockerhub/sh/start.sh
+++ b/minifi/minifi-docker/dockerhub/sh/start.sh
@@ -15,12 +15,13 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-# Continuously provide logs so that 'docker logs' can    produce them
+# Continuously provide logs so that 'docker logs' can produce them
 tail -F "${MINIFI_HOME}/logs/minifi-app.log" &
 "${MINIFI_HOME}/bin/minifi.sh" run &
 minifi_pid="$!"
 
-trap "echo Received trapped signal, beginning shutdown...;" KILL TERM HUP INT EXIT;
+trap 'echo Received trapped signal, beginning shutdown...;./bin/minifi.sh stop;exit 0;' TERM HUP INT;
+trap ":" EXIT
 
 echo MiNiFi running with PID ${minifi_pid}.
 wait ${minifi_pid}
\ No newline at end of file