make debug shell optional

2 files changed, 10 insertions, 10 deletions

diff --git a/docker/sandcastle/compile-and-check/README b/docker/sandcastle/compile-and-check/README
index 47342ab..68b71a2 100644
--- a/docker/sandcastle/compile-and-check/README
+++ b/docker/sandcastle/compile-and-check/README
@@ -1,7 +1,6 @@
-This Docker image compiles and check all the Taler code,
-along its entrypoint.  Upon failures, it offers a debug
-shell to inspect the running container.  The shell offer
-is however timed out, failing thereafter.
+This Docker image compiles and checks all the Taler code
+along its entrypoint.  In case of build failures, it optionally
+offers a debug shell to inspect the running container.
 
 Build
 -----
@@ -15,6 +14,6 @@ $ docker build -t sandcastle-checker base/
 Run
 ---
 
-From anywhere in the filesystem, run:
+To build Taler and get the debug shell, run:
 
-$ docker run -it sandcastle-checker
+$ docker run -e SANDCASTLE_DEBUG_SHELL=yes -it sandcastle-checker
diff --git a/docker/sandcastle/compile-and-check/base/compile_and_check.sh b/docker/sandcastle/compile-and-check/base/compile_and_check.sh
index b2462fc..f12f1e9 100755
--- a/docker/sandcastle/compile-and-check/base/compile_and_check.sh
+++ b/docker/sandcastle/compile-and-check/base/compile_and_check.sh
@@ -3,12 +3,13 @@
 set -eu
 
 start_debug_shell () {
-  bash --init-file <(echo \
-    "echo 'Press enter for the debug shell..'; read -t 300 || exit $?"
-  ) -i
+  if test "${SANDCASTLE_DEBUG_SHELL:-no}" = yes; then
+    bash --init-file <(echo \
+      "echo 'Taler build failed, press enter to get the debug shell..'; read || exit $?"
+    ) -i
+  fi
 }
 trap start_debug_shell ERR
-
 echo -n Exporting the tags environment..
 set -a
 . tags.sh