Merge branch 'master' into reserve_example11

ros-controls · Sep 27, 2023 · d9d3332 · d9d3332
2 parents 837b7b0 + 07a897f
commit d9d3332
Show file tree

Hide file tree

Showing 3 changed files with 268 additions and 56 deletions.
diff --git a/Dockerfile/entrypoint.sh b/Dockerfile/entrypoint.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
 . /opt/ros/"${ROS_DISTRO}"/setup.sh
-. /home/ros2_ws/install/setup.sh
+cd /home/ros2_ws
+. install/setup.sh
 exec "$@"
diff --git a/doc/run_from_docker.rst b/doc/run_from_docker.rst
@@ -1,9 +1,3 @@
 .. note::
 
-   The commands below are given for a local installation of this repository and its dependencies. If you use the provided docker container, add the prefix
-
-   .. code::
-
-      docker run -it --rm --name ros2_control_demos --net host ros2_control_demos
-
-   to every command followed by a ``gui:=false``. For more information on the docker usage see :ref:`ros2_control_demos_install`.
+   The commands below are given for a local installation of this repository and its dependencies as well as for running them from a docker container. For more information on the docker usage see :ref:`doc/ros2_control_demos/doc/index:using docker`.