Merge pull request #416 from nix-community/effects-bind

buildbot_effects: bind /bin/sh

Author: Mic92

buildbot_effects/buildbot_effects/__init__.py

@@ -240,6 +240,9 @@ def run_effects(
         "--bind",
         "/nix/var/nix/daemon-socket/socket",
         "/nix/var/nix/daemon-socket/socket",
+        "--ro-bind",
+        "/bin/sh",
+        "/bin/sh",
     ]
 
     with NamedTemporaryFile() as tmp:

buildbot_nix/buildbot_nix/worker.py

@@ -25,11 +25,12 @@ class WorkerConfig:
     worker_name: str = field(
         default_factory=lambda: os.environ.get("WORKER_NAME", socket.gethostname())
     )
-    worker_count_str: str | None = os.environ.get("WORKER_COUNT")
-    if worker_count_str is not None:
-        worker_count = int(worker_count_str)
-    else:
+    worker_count_str: str = os.environ.get("WORKER_COUNT", "0")
+    worker_count = int(worker_count_str)
+
+    if worker_count == 0:
         worker_count = multiprocessing.cpu_count()
+
     buildbot_dir: Path = field(
         default_factory=lambda: Path(require_env("BUILDBOT_DIR"))
     )