From 2209abe4f9a87622601d59e1a2257a8194e21f7d Mon Sep 17 00:00:00 2001
From: Zoheb Shaikh <26975142+ZohebShaikh@users.noreply.github.com>
Date: Fri, 28 Aug 2026 15:50:15 +0000
Subject: [PATCH 1/2] fix: prevent RUNNER detection failure

Append `|| true` so the justfile can still be parsed/used on systems without
a container runtime like docker or podman, instead of erroring out at command substitution time.
---
 justfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/justfile b/justfile
index 283458865..2129b6b14 100644
--- a/justfile
+++ b/justfile
@@ -1,5 +1,5 @@
 SESSION := "cm12345-1"
-RUNNER := `command -v docker || command -v podman`
+RUNNER := `command -v docker || command -v podman || true`
 
 default: compose serve
 

From d55ed6edb1aebb1ec625f7644e9dd14cb98a4cda Mon Sep 17 00:00:00 2001
From: Zoheb Shaikh <26975142+ZohebShaikh@users.noreply.github.com>
Date: Tue, 1 Sep 2026 08:16:57 +0000
Subject: [PATCH 2/2] ci: add _check-runner to ensure container runtime
 availability

---
 justfile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/justfile b/justfile
index 2129b6b14..7fb50ecf4 100644
--- a/justfile
+++ b/justfile
@@ -1,6 +1,13 @@
 SESSION := "cm12345-1"
 RUNNER := `command -v docker || command -v podman || true`
 
+_check-runner:
+    #!/usr/bin/env bash
+    if [[ "{{ RUNNER }}" == "" ]]; then
+        echo "{{ style('error') }}error{{ NORMAL }}: No container runtime available - either podman or docker is required"
+        exit 1
+    fi
+
 default: compose serve
 
 init-example-services:
@@ -10,7 +17,7 @@ init-example-services:
         git submodule update --init example-services
     fi
 
-compose +ARGS="up -d --no-recreate": init-example-services
+compose +ARGS="up -d --no-recreate": init-example-services _check-runner
     {{ RUNNER }} compose -f tests/system_tests/compose.yaml {{ARGS}}
 
 serve *OPTS: