ellensohn/ros2_rmp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Björn Ellensohn 2023-07-31 11:01:11 +02:00
parent 5716691ada
commit 4681394fdb
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yaml
View File

@ -140,8 +140,6 @@ services:
# Networking and IPC for ROS 2 # Networking and IPC for ROS 2
network_mode: host network_mode: host
ipc: host ipc: host
depends_on:
- localization
# navigation # navigation
navigation: navigation:
@ -154,8 +152,6 @@ services:
# Networking and IPC for ROS 2 # Networking and IPC for ROS 2
network_mode: host network_mode: host
ipc: host ipc: host
depends_on:
- localization
# bash # bash
bash: bash:

3
docker/Dockerfile
View File

@ -42,7 +42,8 @@ RUN source /opt/ros/${ROS_DISTRO}/setup.bash \
# Use Cyclone DDS as middleware # Use Cyclone DDS as middleware
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
ros-${ROS_DISTRO}-rmw-cyclonedds-cpp ros-${ROS_DISTRO}-rmw-cyclonedds-cpp \
ros-${ROS_DISTRO}-xacro
ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
ENV UNDERLAY_WS=${UNDERLAY_WS} ENV UNDERLAY_WS=${UNDERLAY_WS}

4
docker/entrypoint.sh
View File

@ -10,7 +10,7 @@ if [ -f ${UNDERLAY_WS}/install/setup.bash ]
then then
source ${UNDERLAY_WS}/install/setup.bash source ${UNDERLAY_WS}/install/setup.bash
#export GAZEBO_MODEL_PATH=$GAZEBO_MODEL_PATH:$(ros2 pkg prefix turtlebot3_gazebo)/share/turtlebot3_gazebo/models #export GAZEBO_MODEL_PATH=$GAZEBO_MODEL_PATH:$(ros2 pkg prefix turtlebot3_gazebo)/share/turtlebot3_gazebo/models
echo "Sourced Bot Mini base workspace" echo "Sourced CPS RMP 220 base workspace"
fi fi
# Source the overlay workspace, if built # Source the overlay workspace, if built
@ -18,7 +18,7 @@ if [ -f /overlay_ws/install/setup.bash ]
then then
source /overlay_ws/install/setup.bash source /overlay_ws/install/setup.bash
#export GAZEBO_MODEL_PATH=$GAZEBO_MODEL_PATH:$(ros2 pkg prefix tb3_worlds)/share/tb3_worlds/models #export GAZEBO_MODEL_PATH=$GAZEBO_MODEL_PATH:$(ros2 pkg prefix tb3_worlds)/share/tb3_worlds/models
echo "Sourced Bot Mini overlay workspace" echo "Sourced CPS RMP 220 Overlay workspace"
fi fi
# Execute the command passed into this entrypoint # Execute the command passed into this entrypoint