From aea4d51159adb693d8ff225dec26c9bd182d7bda Mon Sep 17 00:00:00 2001
From: "Josh.5" <jsunnex@gmail.com>
Date: Wed, 23 Aug 2023 16:57:40 +1200
Subject: [PATCH] Use dumb-init for sunshine-run wrapper

---
 Dockerfile.debian            | 9 +++++++++
 overlay/usr/bin/sunshine-run | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.debian b/Dockerfile.debian
index c67f94c..d797ae8 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -482,6 +482,15 @@ RUN \
     && \
     echo
 
+# Various other tools
+ARG DUMB_INIT_VERSION=1.2.5
+RUN \
+    echo "**** Install dumb-init ****" \
+        && wget -O /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMB_INIT_VERSION}/dumb-init_${DUMB_INIT_VERSION}_x86_64 \
+        && chmod +x /usr/bin/dumb-init \
+    && \
+    echo
+
 # Add FS overlay
 COPY overlay /
 
diff --git a/overlay/usr/bin/sunshine-run b/overlay/usr/bin/sunshine-run
index 9c6a4b5..f27292f 100755
--- a/overlay/usr/bin/sunshine-run
+++ b/overlay/usr/bin/sunshine-run
@@ -24,7 +24,7 @@ trap _term EXIT
 
 
 # RUN CHILD PROCESS
-"${@}" &
+/usr/bin/dumb-init "${@}" &
 proc_pid=$!