From 45836392d16eb74e24ab8c509a6f3b0c5fd39f24 Mon Sep 17 00:00:00 2001 From: Maxfield Lehman <_@maxfieldlehman.com> Date: Tue, 2 Oct 2018 06:12:16 -0700 Subject: [PATCH 1/2] Kill sshd on SIGTERM instead of waiting for docker stop timeout. --- start.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) mode change 100644 => 100755 start.sh diff --git a/start.sh b/start.sh old mode 100644 new mode 100755 index 6000392..5abfa04 --- a/start.sh +++ b/start.sh @@ -1,5 +1,12 @@ #!/bin/sh +_term() { + echo "Caught SIGTERM signal!" + kill -TERM "$child" 2>/dev/null +} + +trap _term SIGTERM + # If there is some public key in keys folder # then it copies its contain in authorized_keys file if [ "$(ls -A /git-server/keys/)" ]; then @@ -19,5 +26,7 @@ if [ "$(ls -A /git-server/repos/)" ]; then find . -type d -exec chmod g+s '{}' + fi -# -D flag avoids executing sshd as a daemon -/usr/sbin/sshd -D +/usr/sbin/sshd + +child=$! +wait "$child" From 2826022fe99d4d7dbc2a80dc9d8c3a9399bb4d15 Mon Sep 17 00:00:00 2001 From: Maxfield Lehman <_@maxfieldlehman.com> Date: Tue, 2 Oct 2018 06:30:29 -0700 Subject: [PATCH 2/2] Prevent container from erroneously exiting immediately. --- start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.sh b/start.sh index 5abfa04..c35faf1 100755 --- a/start.sh +++ b/start.sh @@ -26,7 +26,7 @@ if [ "$(ls -A /git-server/repos/)" ]; then find . -type d -exec chmod g+s '{}' + fi -/usr/sbin/sshd +/usr/sbin/sshd -D & child=$! wait "$child"