add option container_name

keurfonluu · Jan 9, 2024 · f840cfe · f840cfe
1 parent b0da3bf
commit f840cfe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/tests/test_run.py b/tests/test_run.py
@@ -28,6 +28,7 @@ def test_run(exec, workers, docker, wsl, cmd):
         use_temp=sys.version_info >= (3, 8),
         ignore_patterns=["INFILE"],
         silent=True,
+        container_name="CONTAINER",
     )
 
     assert status.args == cmd
@@ -44,15 +45,15 @@ def test_run(exec, workers, docker, wsl, cmd):
             None,
             "docker-image",
             False,
-            "docker run --rm  -v PLACEHOLDER:/shared -w /shared docker-image tough-exec INFILE INFILE.out",
+            "docker run --name CONTAINER --rm --volume PLACEHOLDER:/shared --workdir /shared docker-image tough-exec INFILE INFILE.out",
         ),
         ("tough-exec", None, None, True, "bash -c 'tough-exec INFILE INFILE.out'"),
         (
             "tough-exec",
             8,
             "docker-image",
             True,
-            """bash -c 'docker run --rm  -v PLACEHOLDER:/shared -w /shared docker-image mpiexec -n 8 tough-exec INFILE INFILE.out'""",
+            """bash -c 'docker run --name CONTAINER --rm --volume PLACEHOLDER:/shared --workdir /shared docker-image mpiexec -n 8 tough-exec INFILE INFILE.out'""",
         ),
     ],
 )

diff --git a/toughio/_run.py b/toughio/_run.py
@@ -27,6 +27,7 @@ def run(
     silent=False,
     petsc_args=None,
     docker_args=None,
+    container_name=None,
     **kwargs,
 ):
     """
@@ -60,6 +61,8 @@ def run(
         List of arguments passed to PETSc solver (written to `.petscrc`).
     docker_args : list or None, optional, default None
         List of arguments passed to `docker run` command.
+    container_name : str or None, optional, default None
+        Name of Docker container.
 
     Other Parameters
     ----------------
@@ -223,7 +226,7 @@ def run(
     is_windows = platform.system().startswith("Win")
 
     if docker:
-        container_name = f"toughio_{secrets.token_hex(4)}"
+        container_name = container_name if container_name else f"toughio_{secrets.token_hex(4)}"
 
         if is_windows and os.getenv("ComSpec").endswith("cmd.exe"):
             cwd = '"%cd%"'