Fix(aws): Make sure docker wrapper script runs fully even when we exit

Closes #70

Author: klieret

aws/docker_and_sync.sh

@@ -28,6 +28,9 @@ cleanup() {
     docker system prune -af
     echo "Docker space usage:"
     docker system df
+    echo "═══════════════════════════════════════════════════════════════════════════════"
+    echo "✅ Wrapper script docker_and_sync.sh finished, exit code: $exit_code"
+    echo "═══════════════════════════════════════════════════════════════════════════════"
     exit $exit_code
 }
 
@@ -82,9 +85,8 @@ mkdir -p logs
 # Set ulimit for number of open files, relevant for matrix
 ulimit -n 65536
 
-# Execute the command passed to container
-"$@"
-
 echo "═══════════════════════════════════════════════════════════════════════════════"
-echo "✅ Wrapper script docker_and_sync.sh finished"
+echo "✅ Wrapper script docker_and_sync.sh pologue finished, executing user command: $*"
 echo "═══════════════════════════════════════════════════════════════════════════════"
+# Execute the command passed to container
+"$@"

aws/setup/docker/docker_entrypoint.sh

@@ -6,6 +6,20 @@ echo "════════════════════════
 echo "🚀 Hello from docker_entrypoint.sh"
 echo "═══════════════════════════════════════════════════════════════════════════════"
 
+# Function to show disk usage on exit
+cleanup() {
+    local exit_code=$?
+    echo "💾 Disk usage after job:"
+    df -h
+    echo "═══════════════════════════════════════════════════════════════════════════════"
+    echo "✅ docker_entrypoint.sh finished, exit code: $exit_code"
+    echo "═══════════════════════════════════════════════════════════════════════════════"
+    exit $exit_code
+}
+
+# Set trap to always show disk usage on exit (normal exit, signals, errors)
+trap cleanup EXIT
+
 echo "📅 Container built at: $BUILD_TIMESTAMP"
 echo "🔄 Updating repository..."
 
@@ -42,13 +56,3 @@ echo "$@"
 echo "═══════════════════════════════════════════════════════════════════════════════"
 # Execute the remaining command arguments
 exec "$@"
-echo "═══════════════════════════════════════════════════════════════════════════════"
-echo "✅ User provided command finished"
-echo "═══════════════════════════════════════════════════════════════════════════════"
-
-echo "💾 Disk usage after job:"
-df -h
-
-echo "═══════════════════════════════════════════════════════════════════════════════"
-echo "✅ docker_entrypoint.sh finished"
-echo "═══════════════════════════════════════════════════════════════════════════════"