standalone #1

Merged
aqua3 merged 10 commits from standalone into main 2024-07-11 15:54:35 -03:00
2 changed files with 4 additions and 28 deletions
Showing only changes of commit 46f41982a5 - Show all commits

View File

@ -23,4 +23,4 @@ RUN apt-get clean
COPY ./ros_entrypoint.sh /ros_entrypoint.sh COPY ./ros_entrypoint.sh /ros_entrypoint.sh
RUN /bin/bash -c "dos2unix /ros_entrypoint.sh" RUN /bin/bash -c "dos2unix /ros_entrypoint.sh"
HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD /ros_entrypoint.sh rostopic list HEALTHCHECK --interval=5s --timeout=5s --retries=3 CMD /ros_entrypoint.sh rostopic list

View File

@ -4,31 +4,6 @@ version: "3.8"
services: services:
# mavros:
# #This service bridges our mavlink-based robot-coprosessor into ROS
# #In this example it connects to a simulated coprocessor.
# image: git.spirirobotics.com/spiri/services-ros1-mavros:master
# command: roslaunch mavros px4.launch fcu_url:="udp://:14557@gazebo:14540"
# environment:
# - "ROS_MASTER_URI=http://ros-master:11311"
# depends_on:
# ros-master:
# condition: service_healthy
# # mavproxy:
# # condition: service_started
# restart: always
# deploy:
# resources:
# limits:
# # cpus: '0.01'
# memory: 200M
# ulimits:
# nofile:
# soft: 1024
# hard: 524288
# networks:
# - sim_network
ros-master: ros-master:
image: git.spirirobotics.com/spiri/services-ros1-core:main image: git.spirirobotics.com/spiri/services-ros1-core:main
command: stdbuf -o L roscore command: stdbuf -o L roscore
@ -52,6 +27,7 @@ services:
xbee-mav: xbee-mav:
command: tail -f /dev/null command: tail -f /dev/null
# command: rosrun xbee_ros_node xbee_config /dev/ttyUSB0 9600
container_name: xbee-mav container_name: xbee-mav
depends_on: depends_on:
- ros-master - ros-master
@ -59,7 +35,7 @@ services:
context: . context: .
dockerfile: Dockerfile dockerfile: Dockerfile
devices: devices:
- 'COM16' - /dev/ttyUSB0:/dev/ttyUSB0
environment: environment:
- "ROS_MASTER_URI=http://ros-master:11311" - "ROS_MASTER_URI=http://ros-master:11311"
networks: networks:
@ -67,4 +43,4 @@ services:
networks: networks:
sim_network: sim_network:
driver: bridge driver: bridge