Spiri
/
spiri-sdk
11
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feature/multi-robots-types #12

Merged
aqua3 merged 20 commits from feature/multi-robots-types into master 2024-12-05 11:36:57 -04:00
Conversation 0 Commits 20 Files Changed 15 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9fc85c92e6 - Show all commits

2
docker-compose.yml
View File

@ -13,7 +13,7 @@ services:
# QT_QPA_PLATFORM: "${QT_QPA_PLATFORM:-xcb}" # QT_QPA_PLATFORM: "${QT_QPA_PLATFORM:-xcb}"
XDG_RUNTIME_DIR: "${XDG_RUNTIME_DIR}" XDG_RUNTIME_DIR: "${XDG_RUNTIME_DIR}"
ROS_MASTER_URI: "http://ros-master:11311" ROS_MASTER_URI: "http://ros-master:11311"
PYTHONASYNCIODEBUG: "1" RMW_IMPLEMENTATION: rmw_cyclonedds_cpp
volumes: volumes:
# X11 socket # X11 socket

3
guiTools/Dockerfile
View File

@ -11,7 +11,8 @@ RUN apt-get -y install qterminal mesa-utils \
gstreamer1.0-gl \ gstreamer1.0-gl \
gstreamer1.0-plugins-good \ gstreamer1.0-plugins-good \
gstreamer1.0-plugins-bad \ gstreamer1.0-plugins-bad \
gstreamer1.0-plugins-ugly gstreamer1.0-plugins-ugly \
ros-${ROS_DISTRO}-rmw-cyclonedds-cpp
COPY --from=git.spirirobotics.com/spiri/gazebo-resources:main /plugins /ardupilot_gazebo/plugins COPY --from=git.spirirobotics.com/spiri/gazebo-resources:main /plugins /ardupilot_gazebo/plugins