From 3364aa0d8c4cc1ad19f5694376ffc9488991bf36 Mon Sep 17 00:00:00 2001
From: Jack Vanlightly <vanlightly@gmail.com>
Date: Tue, 26 Oct 2021 10:31:50 +0200
Subject: [PATCH 1/3] Ensure BookKeeper process receives sigterm in docker
 container

---
 docker/scripts/entrypoint.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/scripts/entrypoint.sh b/docker/scripts/entrypoint.sh
index 657eb6b918e..9de34646583 100755
--- a/docker/scripts/entrypoint.sh
+++ b/docker/scripts/entrypoint.sh
@@ -41,11 +41,11 @@ function run_command() {
         chmod -R +x ${BINDIR}
         chmod -R +x ${SCRIPTS_DIR}
         echo "This is root, will use user $BK_USER to run command '$@'"
-        sudo -s -E -u "$BK_USER" /bin/bash "$@"
+        exec sudo -s -E -u "$BK_USER" /bin/bash "$@"
         exit
     else
         echo "Run command '$@'"
-        $@
+        exec $@
     fi
 }
 

From 71a6aa89e854bc00037d66008a9cb521905b8216 Mon Sep 17 00:00:00 2001
From: Jack Vanlightly <vanlightly@gmail.com>
Date: Tue, 26 Oct 2021 13:00:10 +0200
Subject: [PATCH 2/3] Wrap parameters in quotes to ensure correct expansion

---
 docker/scripts/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/entrypoint.sh b/docker/scripts/entrypoint.sh
index 9de34646583..7ee123cb923 100755
--- a/docker/scripts/entrypoint.sh
+++ b/docker/scripts/entrypoint.sh
@@ -45,7 +45,7 @@ function run_command() {
         exit
     else
         echo "Run command '$@'"
-        exec $@
+        exec "$@"
     fi
 }
 

From e923d140d61bfd583e42a048ee038cdd171ed10a Mon Sep 17 00:00:00 2001
From: Jack Vanlightly <vanlightly@gmail.com>
Date: Tue, 26 Oct 2021 15:11:16 +0200
Subject: [PATCH 3/3] Make both run_command execution paths equiavlent

---
 docker/scripts/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/entrypoint.sh b/docker/scripts/entrypoint.sh
index 7ee123cb923..753f59a20db 100755
--- a/docker/scripts/entrypoint.sh
+++ b/docker/scripts/entrypoint.sh
@@ -41,7 +41,7 @@ function run_command() {
         chmod -R +x ${BINDIR}
         chmod -R +x ${SCRIPTS_DIR}
         echo "This is root, will use user $BK_USER to run command '$@'"
-        exec sudo -s -E -u "$BK_USER" /bin/bash "$@"
+        exec sudo -s -E -u "$BK_USER" /bin/bash -c 'exec "$@"' -- "$@"
         exit
     else
         echo "Run command '$@'"