From ace291230fdc24e53dece5f69d1f8e9b8162db08 Mon Sep 17 00:00:00 2001
From: Gilles Filippini <pini@debian.org>
Date: Wed, 28 Jun 2023 00:19:03 +0200
Subject: [PATCH] docker: move sigterm handling up to the entrypoint
Having it into the duniter.sh script prevents using duniter subcommands
such as `duniter wizard key` which are then launched in the background.
Moving it into the entrypoint makes the subcommands available again.
---
release/docker/docker-entrypoint.sh | 13 ++++++++++++-
release/docker/duniter.sh | 13 +------------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/release/docker/docker-entrypoint.sh b/release/docker/docker-entrypoint.sh
index 523c9e33c..08db15711 100755
--- a/release/docker/docker-entrypoint.sh
+++ b/release/docker/docker-entrypoint.sh
@@ -121,7 +121,18 @@ else
set -- $MAX_OLD_SPACE_SIZE "$@"
fi
+# Terminate gracefully on SIGTERM by propagating it to the 'node' process
+sigterm () {
+ echo "Received SIGTERM. Terminating..." >&2
+ pkill node
+ wait %1
+}
+trap 'sigterm' TERM
+
# Start duniter
+# Launch in background and wait
+# This way we can catch SIGTERM
echo Starting duniter with:
echo /usr/bin/duniter "$@"
-exec /usr/bin/duniter "$@"
+/usr/bin/duniter "$@" &
+wait %1
diff --git a/release/docker/duniter.sh b/release/docker/duniter.sh
index 7a8aab3ea..cbb338b71 100755
--- a/release/docker/duniter.sh
+++ b/release/docker/duniter.sh
@@ -1,20 +1,9 @@
#!/bin/sh
-# Terminate gracefully on SIGTERM by propagating it to the 'node' process
-sigterm () {
- echo "Received SIGTERM. Terminating..." >&2
- pkill node
- wait %1
-}
-trap 'sigterm' TERM
-
# Main
cd /duniter
if [ "$1" != --home ]; then
set -- --home /var/lib/duniter "$@"
fi
-# Launch in background and wait
-# This way we can catch SIGTERM
-bin/duniter "$@" &
-wait %1
+exec bin/duniter "$@"
--
GitLab