From ffb82437217c9b66026291e51302570b9d957d9e Mon Sep 17 00:00:00 2001
From: afjcjsbx <afjcjsbx@gmail.com>
Date: Wed, 13 May 2026 20:03:55 +0200
Subject: [PATCH] fix(integration): docker runner workspace mounts and go
 command path

---
 integration/docker-compose.runner.yml                | 4 ++--
 integration/suites/mcp-streamable/docker-compose.yml | 7 +------
 scripts/run-integration-tests.sh                     | 3 ++-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/integration/docker-compose.runner.yml b/integration/docker-compose.runner.yml
index 1de2f7922..cb7592ca4 100644
--- a/integration/docker-compose.runner.yml
+++ b/integration/docker-compose.runner.yml
@@ -2,9 +2,9 @@ services:
   integration-runner:
     image: golang:1.25-bookworm
     working_dir: /workspace
-    entrypoint: ["bash", "-lc"]
+    entrypoint: ["bash", "-c"]
     volumes:
-      - .:/workspace
+      - ${INTEGRATION_REPO_ROOT}:/workspace
       - picoclaw-integration-gocache:/go-build-cache
       - picoclaw-integration-gomodcache:/go-mod-cache
     environment:
diff --git a/integration/suites/mcp-streamable/docker-compose.yml b/integration/suites/mcp-streamable/docker-compose.yml
index 5d1728191..351aa3726 100644
--- a/integration/suites/mcp-streamable/docker-compose.yml
+++ b/integration/suites/mcp-streamable/docker-compose.yml
@@ -1,14 +1,9 @@
 services:
   integration-runner:
-    image: golang:1.25-bookworm
     depends_on:
       mcp-streamable-server:
         condition: service_healthy
-    volumes:
-      - .:/src
-    working_dir: /src
     environment:
-      PATH: "/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
       PICOCLAW_MCP_REAL_SERVER_JSON: >-
         {"enabled":true,"type":"http","url":"http://mcp-streamable-server:8080/mcp"}
       PICOCLAW_MCP_REAL_TOOL_NAME: echo
@@ -18,7 +13,7 @@ services:
 
   mcp-streamable-server:
     build:
-      context: .
+      context: ${INTEGRATION_REPO_ROOT}
       dockerfile: integration/fixtures/mcp-streamable-server/Dockerfile
     environment:
       STREAMABLE_JSON_RESPONSE: "true"
diff --git a/scripts/run-integration-tests.sh b/scripts/run-integration-tests.sh
index ee092223e..bd7ef818f 100644
--- a/scripts/run-integration-tests.sh
+++ b/scripts/run-integration-tests.sh
@@ -63,6 +63,7 @@ run_suite() {
     # shellcheck disable=SC1090
     source "$manifest"
     set +a
+    export INTEGRATION_REPO_ROOT="$ROOT_DIR"
 
     : "${TEST_COMMAND:?suite $suite_name must define TEST_COMMAND in $manifest}"
     runner_service="${RUNNER_SERVICE:-integration-runner}"
@@ -91,7 +92,7 @@ run_suite() {
     fi
 
     echo "==> [$suite_name] running: $TEST_COMMAND"
-    # integration-runner already uses `bash -lc` as its entrypoint, so pass the
+    # integration-runner already uses `bash -c` as its entrypoint, so pass the
     # suite command as a single argument for Bash to execute directly.
     docker compose "${compose_args[@]}" run --rm "$runner_service" "$TEST_COMMAND"
   )