From e36f242d310c40757096716d56f65b6b1b7419f7 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Fri, 28 Oct 2022 19:18:58 +0100
Subject: [PATCH] fix: exit handler

---
 Dockerfile.ubuntu-1804 | 3 +++
 Dockerfile.ubuntu-2004 | 3 +++
 Dockerfile.ubuntu-2204 | 3 +++
 entrypoint.sh          | 8 +++++---
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.ubuntu-1804 b/Dockerfile.ubuntu-1804
index 785c619..7e6b628 100644
--- a/Dockerfile.ubuntu-1804
+++ b/Dockerfile.ubuntu-1804
@@ -105,3 +105,6 @@ HEALTHCHECK --interval=1m --timeout=1m --start-period=2m --retries=1 CMD /linuxg
 RUN rm -f /linuxgsm/entrypoint.sh
 COPY entrypoint.sh /linuxgsm/entrypoint.sh
 RUN date > /time.txt
+
+ENTRYPOINT [ "/usr/bin/tini","-g","--" ]
+CMD [ "bash","./entrypoint.sh" ]
diff --git a/Dockerfile.ubuntu-2004 b/Dockerfile.ubuntu-2004
index 517b94f..42a4362 100644
--- a/Dockerfile.ubuntu-2004
+++ b/Dockerfile.ubuntu-2004
@@ -104,3 +104,6 @@ HEALTHCHECK --interval=1m --timeout=1m --start-period=2m --retries=1 CMD /linuxg
 RUN rm -f /linuxgsm/entrypoint.sh
 COPY entrypoint.sh /linuxgsm/entrypoint.sh
 RUN date > /time.txt
+
+ENTRYPOINT [ "/usr/bin/tini","-g","--" ]
+CMD [ "bash","./entrypoint.sh" ]
diff --git a/Dockerfile.ubuntu-2204 b/Dockerfile.ubuntu-2204
index a0dc3c7..5e29376 100644
--- a/Dockerfile.ubuntu-2204
+++ b/Dockerfile.ubuntu-2204
@@ -104,3 +104,6 @@ HEALTHCHECK --interval=1m --timeout=1m --start-period=2m --retries=1 CMD /linuxg
 RUN rm -f /linuxgsm/entrypoint.sh
 COPY entrypoint.sh /linuxgsm/entrypoint.sh
 RUN date > /time.txt
+
+ENTRYPOINT [ "/usr/bin/tini","-g","--" ]
+CMD [ "bash","./entrypoint.sh" ]
diff --git a/entrypoint.sh b/entrypoint.sh
index fc04fa7..6f04967 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -2,13 +2,15 @@
 
 exit_handler() {
   # Execute the shutdown commands
-  echo "recieved SIGTERM stopping ${GAMESERVER}"
+  echo "stopping ${GAMESERVER}"
   ./${GAMESERVER} stop
+  exitcode=$?
+  exit ${exitcode}
 }
 
 # Exit trap
-echo "loading exit trap"
-trap exit_handler SIGTERM
+echo "Loading exit handler"
+trap exit_handler SIGQUIT SIGINT SIGTERM
 
 echo -e ""
 echo -e "Welcome to the LinuxGSM"