From c90862d74c6f7da872b1884b54b04889e726a5f1 Mon Sep 17 00:00:00 2001
From: Daniel-Eisenberg <59121493+Daniel-Eisenberg@users.noreply.github.com>
Date: Thu, 6 Nov 2025 10:53:49 +0200
Subject: [PATCH] Docker stop issue (#366)

* fix image entrypoint sigterm

* fix image entrypoint sigterm

---------

Co-authored-by: avigailo <avigailo@checkpoint.com>
---
 build_system/docker/entry.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/build_system/docker/entry.sh b/build_system/docker/entry.sh
index 7a84e98..167efb3 100644
--- a/build_system/docker/entry.sh
+++ b/build_system/docker/entry.sh
@@ -15,6 +15,21 @@ var_mode=
 var_token=
 var_ignore=
 init=
+active_watchdog_pid=
+
+cleanup() {
+    local signal="$1"
+    echo "[$(date '+%Y-%m-%d %H:%M:%S')] Signal ${signal} was received, exiting gracefully..." >&2
+    if [ -n "${active_watchdog_pid}" ] && ps -p ${active_watchdog_pid} > /dev/null 2>&1; then
+        kill -TERM ${active_watchdog_pid} 2>/dev/null || true
+        wait ${active_watchdog_pid} 2>/dev/null || true
+    fi
+    echo "Cleanup completed. Exiting now." >&2
+    exit 0
+}
+
+trap 'cleanup SIGTERM' SIGTERM
+trap 'cleanup SIGINT' SIGINT
 
 if [ ! -f /nano-service-installers/$ORCHESTRATION_INSTALLATION_SCRIPT ]; then
     echo "Error: agent installation package doesn't exist."