Merge pull request #5 from ika-rwth-aachen/improvement/workdir

Improve workdir handling of docker-run-docker-ros
ika-rwth-aachen · Jun 15, 2023 · 77e1f76 · 77e1f76
2 parents 63435ed + b3c46de
commit 77e1f76
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/docker-run-cli/pyproject.toml b/docker-run-cli/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "docker-run-cli"
-version = "0.9.4"
+version = "0.9.5"
 description = "'docker run' and 'docker exec' with useful defaults"
 license = {file = "LICENSE"}
 readme = "README.md"

diff --git a/docker-run-cli/src/docker_run/__init__.py b/docker-run-cli/src/docker_run/__init__.py
@@ -1,2 +1,2 @@
 __name__ = "docker-run"
-__version__ = "0.9.4"
+__version__ = "0.9.5"
diff --git a/docker-run-docker-ros/pyproject.toml b/docker-run-docker-ros/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "docker-run-docker-ros"
-version = "1.0.3"
+version = "1.0.4"
 description = "docker-run plugin for Docker images built by docker-ros"
 license = {file = "LICENSE"}
 readme = "README.md"

diff --git a/docker-run-docker-ros/src/docker_run/plugins/docker_ros.py b/docker-run-docker-ros/src/docker_run/plugins/docker_ros.py
@@ -6,12 +6,13 @@
 from docker_run.plugins.plugin import Plugin
 
 
-__version__ = "1.0.3"
+__version__ = "1.0.4"
 
 
 class DockerRosPlugin(Plugin):
 
-    TARGET_MOUNT = "/docker-ros/ws/src/target"
+    WORKSPACE = "/docker-ros/ws"
+    TARGET_MOUNT = f"{WORKSPACE}/src/target"
 
     @classmethod
     def addArguments(cls, parser: argparse.ArgumentParser):
@@ -51,4 +52,4 @@ def userExecFlags(cls, user: str) -> List[str]:
 
     @classmethod
     def currentDirMountWorkspaceFlags(cls) -> List[str]:
-        return [f"--volume {os.getcwd()}:{cls.TARGET_MOUNT}"]
+        return [f"--volume {os.getcwd()}:{cls.TARGET_MOUNT}", f"--workdir {cls.WORKSPACE}"]