From 8d7043e0224bf54d0063a4767232c68540449018 Mon Sep 17 00:00:00 2001 From: Lennart Reiher Date: Wed, 14 Jun 2023 08:15:02 +0200 Subject: [PATCH 1/3] set workdir on --mws --- docker-run-docker-ros/src/docker_run/plugins/docker_ros.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 index 93f176a..9744ee9 100644 --- a/docker-run-docker-ros/src/docker_run/plugins/docker_ros.py +++ b/docker-run-docker-ros/src/docker_run/plugins/docker_ros.py @@ -11,7 +11,8 @@ 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}"] From 241d9f44ce6cd506a092828ae6475398cd3633e3 Mon Sep 17 00:00:00 2001 From: Lennart Reiher Date: Wed, 14 Jun 2023 23:43:01 +0200 Subject: [PATCH 2/3] bump version of docker-run-docker-ros to 1.0.4 --- docker-run-docker-ros/pyproject.toml | 2 +- docker-run-docker-ros/src/docker_run/plugins/docker_ros.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-run-docker-ros/pyproject.toml b/docker-run-docker-ros/pyproject.toml index dcfe53c..48d58a4 100644 --- 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 index 9744ee9..0b4e28d 100644 --- 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,7 +6,7 @@ from docker_run.plugins.plugin import Plugin -__version__ = "1.0.3" +__version__ = "1.0.4" class DockerRosPlugin(Plugin): From b3c46de4456a56f93724d638b56fa747e3732083 Mon Sep 17 00:00:00 2001 From: Lennart Reiher Date: Wed, 14 Jun 2023 23:44:05 +0200 Subject: [PATCH 3/3] bump version of docker-run to 0.9.5 --- docker-run-cli/pyproject.toml | 2 +- docker-run-cli/src/docker_run/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-run-cli/pyproject.toml b/docker-run-cli/pyproject.toml index 357dbd2..54f8ea4 100644 --- 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 index efc781d..7f4ad96 100644 --- 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" \ No newline at end of file +__version__ = "0.9.5" \ No newline at end of file