Compare commits

..

No commits in common. "82fe921df7a59393317f77abb15a6a2e90c1a968" and "1865af75f40fee6e06c928e8de81ef629821088b" have entirely different histories.

View File

@ -2,7 +2,7 @@ version: "3.9"
services: services:
# Base image containing dependencies. # Base image containing dependencies.
base: base:
image: ghcr.io/bjoernellens1/ros2_bot_mini/bot_mini:base image: bot_mini:base
build: build:
context: . context: .
dockerfile: docker/Dockerfile dockerfile: docker/Dockerfile
@ -30,27 +30,15 @@ services:
# Overlay image containing the example source code. # Overlay image containing the example source code.
overlay: overlay:
extends: base extends: base
image: ghcr.io/bjoernellens1/ros2_bot_mini/bot_mini:overlay image: bot_mini:overlay
build: build:
context: . context: .
dockerfile: docker/Dockerfile dockerfile: docker/Dockerfile
target: overlay target: overlay
# Robot State Publisher
robot_state_publisher:
extends: overlay
command: >
ros2 launch bot_mini_bringup rsp.launch.py
stdin_open: true
tty: true
# Networking and IPC for ROS 2
network_mode: host
ipc: host
# Controller and teleop # Controller and teleop
controller: controller:
extends: overlay extends: overlay
command: > command: >
/controller_startup.sh /controller_startup.sh
devices: devices:
@ -65,8 +53,6 @@ services:
ipc: host ipc: host
# Needed to display graphical applications # Needed to display graphical applications
privileged: true privileged: true
depends_on:
- robot_state_publisher
# MicroRos Agent # MicroRos Agent
microros_agent: microros_agent:
@ -84,24 +70,11 @@ services:
# Needed to display graphical applications # Needed to display graphical applications
privileged: true privileged: true
# sensors
sensors:
extends: overlay
command: >
ros2 launch bot_mini_bringup robot_lidar.launch.py
stdin_open: true
tty: true
# Networking and IPC for ROS 2
network_mode: host
ipc: host
depends_on:
- robot_state_publisher
# Localization # Localization
localization: localization:
extends: overlay extends: overlay
command: > command: >
ros2 launch bot_mini_bringup robot_localization.launch.py /localization_startup.sh
devices: devices:
- /dev/ttyUSB0:/dev/ttyUSB0 - /dev/ttyUSB0:/dev/ttyUSB0
- /dev/ttyUSB1:/dev/ttyUSB1 - /dev/ttyUSB1:/dev/ttyUSB1