From 6e5818d36bb2c33bc0036921b85d5037c33c0376 Mon Sep 17 00:00:00 2001
From: Rui Carmo <rui.carmo@gmail.com>
Date: Sat, 24 Oct 2026 09:21:08 +0000
Subject: [PATCH] Match runtime smoke cgroup namespace to production System

---
 images/patched-docker/smoke-test.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/images/patched-docker/smoke-test.ts b/images/patched-docker/smoke-test.ts
index 5dbd5920..5ca90086 100644
--- a/images/patched-docker/smoke-test.ts
+++ b/images/patched-docker/smoke-test.ts
@@ -49,7 +49,7 @@ async function execLogs(container: string) {
   return logs.stdout + logs.stderr;
 }
 async function start(container: string, readonly: boolean) {
-  await command(["docker", "run", "--detach", "--privileged", "--platform", platform,
+  await command(["docker", "run", "--detach", "--privileged", "--cgroupns=host", "--platform", platform,
     "--name", container, "--mount", `type=volume,src=${container}-data,dst=/data`,
     "--mount", `type=volume,src=${cache},dst=/data/erofs-cache${readonly ? ",readonly" : ""}`,
     image]);
@@ -149,7 +149,10 @@ exec sleep infinity
   for (let attempt = 0; ; attempt++) {
     const ready = await command(["docker", "exec", consumer, "docker", "exec", "exec-cgroup-check", "test", "-f", "/tmp/exec-cgroup-ready"], false);
     if (ready.code === 0) break;
-    assert(attempt < 30, `cgroup exec fixture failed: ${ready.stderr}`);
+    if (attempt >= 30) {
+      const logs = await command(["docker", "exec", consumer, "docker", "logs", "exec-cgroup-check"], false);
+      assert.fail(`cgroup exec fixture failed: ${ready.stderr}\n${logs.stdout}\n${logs.stderr}`);
+    }
     await Bun.sleep(100);
   }
   for (let attempt = 0; attempt < 3; attempt++) {