Skip to content

Add upgrade to Dockerfiles #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rafal-gorecki merged 3 commits into from
Sep 15, 2025
Merged

Add upgrade to Dockerfiles #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20aec57
Add upgrade to Dockerfiles
rafal-gorecki Sep 8, 2025
4f24ca2
Merge branch 'humble' into humble-devel
rafal-gorecki Sep 15, 2025
896c78b
Merge
rafal-gorecki Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions docker/.env
View file
Open in desktop

This file was deleted.

10 changes: 4 additions & 6 deletions docker/compose.rosbot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

services:
rosbot:
image: husarion/rosbot:humble-devel
# build:
# context: ..
# dockerfile: docker/Dockerfile.hardware
# image: husarion/rosbot:humble
build:
context: ..
dockerfile: docker/Dockerfile.hardware
network_mode: host
ipc: host
restart: unless-stopped
Expand All @@ -19,6 +19,4 @@ services:
- USER
command: >
ros2 launch rosbot_bringup bringup.launch.py
mecanum:=${MECANUM:-False}
namespace:=${ROBOT_NAMESPACE:-rosbot}
robot_model:=rosbot
10 changes: 4 additions & 6 deletions docker/compose.rosbot_xl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@

services:
rosbot:
image: husarion/rosbot:humble-devel
# build:
# context: ..
# dockerfile: docker/Dockerfile.hardware
# image: husarion/rosbot:humble
build:
context: ..
dockerfile: docker/Dockerfile.hardware
network_mode: host
ipc: host
restart: unless-stopped
environment:
- USER
command: >
ros2 launch rosbot_bringup bringup.launch.py
mecanum:=${MECANUM:-False}
namespace:=${ROBOT_NAMESPACE:-rosbot}
robot_model:=rosbot_xl
2 changes: 1 addition & 1 deletion docker/compose.rviz.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ x-cpu-config:

services:
rviz:
image: husarion/rosbot:humble-devel
image: husarion/rosbot:humble
# build:
# context: ..
# dockerfile: docker/Dockerfile.simulation
Expand Down
10 changes: 4 additions & 6 deletions docker/compose.simulation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ x-cpu-config:

services:
rosbot:
image: husarion/rosbot-gazebo:jazzy-0.15.1-20250409
# build:
# context: ..
# dockerfile: docker/Dockerfile.simulation
# image: husarion/rosbot-gazebo:humble
build:
context: ..
dockerfile: docker/Dockerfile.simulation
network_mode: host
ipc: host
<<: [ *gpu-config]
Expand All @@ -35,6 +35,4 @@ services:
- /tmp/.X11-unix:/tmp/.X11-unix:rw
command: >
ros2 launch rosbot_gazebo simulation.launch.py
mecanum:=${MECANUM:-False}
namespace:=${ROBOT_NAMESPACE:-rosbot}
robot_model:=${ROBOT_MODEL_NAME:-Error: Specify robot model}
Loading