Skip to content

Commit

Permalink
Minor fixes for docker compose file
Browse files Browse the repository at this point in the history
  • Loading branch information
franklinselva committed Sep 11, 2024
1 parent a71dbb1 commit d9a1b21
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 22 deletions.
2 changes: 1 addition & 1 deletion canadarm2/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

set -e

docker-compose build
docker compose build
9 changes: 1 addition & 8 deletions canadarm2/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,10 @@ services:
[
"bash",
"-c",
"source /opt/ros/$ROS_DISTRO/setup.bash && source ~/canadarm2_ws/install/setup.bash && ros2 launch canadarm_gazebo canadarm.launch.py",
"source /opt/ros/humble/setup.bash && source ~/canadarm2_ws/install/setup.bash && ros2 launch canadarm_gazebo canadarm.launch.py",
]
network_mode: host
privileged: true # for UI
deploy:
resources:
reservations:
devices:
- driver: nvidia
count: 1
capabilities: [gpu]
canadarm_demo:
image: osrf/space-ros:canadarm_demo
build:
Expand Down
4 changes: 2 additions & 2 deletions canadarm2/run.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

docker-comppose down
docker-compose up -d
docker compose down
docker compose up -d
2 changes: 1 addition & 1 deletion curiosity_rover/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

set -e

docker-compose build
docker compose build
9 changes: 1 addition & 8 deletions curiosity_rover/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,10 @@ services:
[
"bash",
"-c",
"source /opt/ros/$ROS_DISTRO/setup.bash && source ~/curiosity_ws/install/setup.bash && ros2 launch curiosity_gazebo curiosity_gazebo.launch.py",
"source /opt/ros/humble/setup.bash && source ~/curiosity_ws/install/setup.bash && ros2 launch curiosity_gazebo curiosity_gazebo.launch.py",
]
network_mode: host
privileged: true # for UI
deploy:
resources:
reservations:
devices:
- driver: nvidia
count: 1
capabilities: [gpu]
curiosity_demo:
image: osrf/space-ros:curiosity_demo
build:
Expand Down
4 changes: 2 additions & 2 deletions curiosity_rover/run.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

docker-compose down
docker-compose up -d
docker compose down
docker compose up -d

0 comments on commit d9a1b21

Please sign in to comment.