Change 'detach' container option when pty is given

fixes #850
getpopper · Jun 7, 2020 · 3b03df8 · 3b03df8
1 parent e490b54
commit 3b03df8
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/cli/popper/runner_host.py b/cli/popper/runner_host.py
@@ -251,7 +251,7 @@ def _get_container_kwargs(self, step, img, name):
             "working_dir": "/workspace",
             "environment": self._prepare_environment(step),
             "entrypoint": step.runs if step.runs else None,
-            "detach": True,
+            "detach": not self._config.pty,
             "tty": self._config.pty,
             "stdin_open": self._config.pty,
         }

diff --git a/cli/test/test_runner_host.py b/cli/test/test_runner_host.py
@@ -156,7 +156,6 @@ def test_get_container_kwargs(self):
                     "environment": {"FOO": "bar"},
                 },
             },
-            "resource_manager": {"name": "slurm"},
         }
 
         config = ConfigLoader.load(
@@ -189,6 +188,37 @@ def test_get_container_kwargs(self):
                 },
             )
 
+        # check container kwargs when pty is enabled
+        config = ConfigLoader.load(
+            config_file=config_dict, workspace_dir="/path/to/workdir", pty=True
+        )
+
+        with DockerRunner(init_docker_client=False, config=config) as dr:
+            args = dr._get_container_kwargs(step, "alpine:3.9", "container_a")
+
+            self.assertEqual(
+                args,
+                {
+                    "image": "alpine:3.9",
+                    "command": ["ls"],
+                    "name": "container_a",
+                    "volumes": [
+                        "/path/to/workdir:/workspace",
+                        "/var/run/docker.sock:/var/run/docker.sock",
+                        "/path/in/host:/path/in/container",
+                    ],
+                    "working_dir": "/workspace",
+                    "environment": {"FOO": "bar"},
+                    "entrypoint": None,
+                    "detach": False,
+                    "stdin_open": True,
+                    "tty": True,
+                    "privileged": True,
+                    "hostname": "popper.local",
+                    "domainname": "www.example.org",
+                },
+            )
+
     @unittest.skipIf(os.environ.get("ENGINE", "docker") != "docker", "ENGINE != docker")
     def test_get_build_info(self):
         step = Box(