fix(workspace): include hidden cwd files in docker layer

2026-06-02 13:12:40 -04:00
parent a08829573d
commit 3885e2f5ad
2 changed files with 57 additions and 13 deletions
@@ -85,11 +85,45 @@ class TestBuildImageWithCwd(unittest.TestCase):

        argv = run.call_args.args[0]
        dockerfile = run.call_args.kwargs["input"]
-        self.assertEqual(["docker", "build", "-t", "derived:tag", "-f", "-", tmp], argv)
+        self.assertEqual(["docker", "build", "-t", "derived:tag", "-f", "-"], argv[:6])
+        self.assertTrue(argv[6].endswith("/context"))
        self.assertIn("FROM base:tag\n", dockerfile)
-        self.assertIn("COPY --chown=node:node . /guest/home/workspace\n", dockerfile)
+        self.assertIn(
+            "COPY --chown=node:node workspace/. /guest/home/workspace\n",
+            dockerfile,
+        )
        self.assertIn("WORKDIR /guest/home/workspace\n", dockerfile)

+    def test_staged_context_includes_hidden_files_but_not_git_dir(self):
+        with tempfile.TemporaryDirectory(prefix="bb-docker-cwd.") as tmp:
+            root = Path(tmp)
+            (root / ".gitignore").write_text("*.pyc\n")
+            (root / ".dockerignore").write_text(".gitignore\n")
+            (root / ".env.example").write_text("SAFE=1\n")
+            (root / ".git").mkdir()
+            (root / ".git" / "config").write_text("[core]\n")
+            workspace = WorkspacePlan(
+                enabled=True,
+                host_path=root,
+                guest_home="/guest/home",
+                guest_path="/guest/home/workspace",
+                workdir="/guest/home/workspace",
+            )
+
+            def inspect_context(*args, **kwargs):
+                context = Path(args[0][-1])
+                staged = context / "workspace"
+                self.assertTrue((staged / ".gitignore").is_file())
+                self.assertTrue((staged / ".dockerignore").is_file())
+                self.assertTrue((staged / ".env.example").is_file())
+                self.assertFalse((staged / ".git").exists())
+                return _ok()
+
+            with patch.object(
+                docker_mod.subprocess, "run", side_effect=inspect_context,
+            ):
+                docker_mod.build_image_with_cwd("derived:tag", "base:tag", workspace)
+

 if __name__ == "__main__":
    unittest.main()