From 70b8599e03785b0cd01ddafedb528097ed4956ee Mon Sep 17 00:00:00 2001
From: Grzegorz Gidel <grg.gdl@gmail.com>
Date: Tue, 18 Apr 2023 05:16:00 +0200
Subject: [PATCH] Allow graceful shutdown in Docker

---
 Dockerfile                  | 6 +++++-
 docker/docker-entrypoint.sh | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4bfabefd4..c19440a65 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,10 @@ FROM node:19.1.0-alpine3.16
 # Arguments
 ARG APP_HOME=/home/node/app
 
+# Ensure proper handling of kernel signals
+RUN apk add tini
+ENTRYPOINT [ "tini", "--" ]
+
 # Create app directory
 WORKDIR ${APP_HOME}
 
@@ -42,4 +46,4 @@ RUN \
 
 EXPOSE 8000
 
-ENTRYPOINT [ "/bin/sh", "-c", "./docker-entrypoint.sh" ]
+CMD [ "./docker-entrypoint.sh" ]
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
index 1e7cf1245..74980632a 100644
--- a/docker/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -25,4 +25,4 @@ if [ ! -s "/home/node/app/config/settings.json" ]; then
 fi
 
 # Start the server
-node /home/node/app/server.js
+exec node /home/node/app/server.js