Skip to content

Commit

Permalink
Revert docker base image to osrf/space-ros:latest
Browse files Browse the repository at this point in the history
  • Loading branch information
franklinselva committed Sep 9, 2024
1 parent 7c5dbc6 commit d92ae92
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
7 changes: 5 additions & 2 deletions canadarm2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
FROM osrf/space-ros:core
FROM osrf/space-ros:latest

ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
ENV ROS_DISTRO=humble
ENV HOME=/home/spaceros-user

# Install dependencies
# Related to space-ros/space-ros#195
RUN sudo apt update && sudo apt install -y ros-${ROS_DISTRO}-control-msgs \
ros-${ROS_DISTRO}-rmw-cyclonedds-cpp

Expand All @@ -16,7 +19,7 @@ COPY .defaults.yaml .defaults.yaml

# Build the workspace
RUN source /opt/ros/${ROS_DISTRO}/setup.bash \
&& source /opt/spaceros/setup.bash \
&& source $HOME/spaceros/install/setup.bash \
&& colcon build

# Source the workspace
Expand Down
2 changes: 1 addition & 1 deletion canadarm2/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ run-control-demo() {
xterm $XTERM_CONFIG -T 'CanadArm2 Demo' -e "docker run -it --rm \
-e RMW_IMPLEMENTATION=rmw_cyclonedds_cpp \
$DOCKER_IMAGE \
bash -c 'source ~/.bashrc && ros2 launch canadarm_demo canadarm.launch.py'" &
bash -c 'source /home/spaceros-user/canadarm_ws/install/setup.bash && ros2 launch canadarm_demo canadarm.launch.py'" &
}

check_docker() {
Expand Down
7 changes: 5 additions & 2 deletions curiosity_rover/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
FROM osrf/space-ros:core
FROM osrf/space-ros:latest

ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
ENV ROS_DISTRO=humble
ENV HOME=/home/spaceros-user

# Install dependencies
# Related to space-ros/space-ros#195
RUN sudo apt update && sudo apt install -y ros-${ROS_DISTRO}-control-msgs \
ros-${ROS_DISTRO}-rmw-cyclonedds-cpp

Expand All @@ -16,7 +19,7 @@ COPY .defaults.yaml .defaults.yaml

# Build the workspace
RUN source /opt/ros/${ROS_DISTRO}/setup.bash \
&& source /opt/spaceros/setup.bash \
&& source $HOME/spaceros/install/setup.bash \
&& colcon build --symlink-install

# Source the workspace
Expand Down
2 changes: 1 addition & 1 deletion curiosity_rover/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ run-control-demo() {
xterm $XTERM_CONFIG -T 'Curiosity Rover Demo' -e "docker run -it --rm \
-e RMW_IMPLEMENTATION=rmw_cyclonedds_cpp \
$DOCKER_IMAGE \
bash -c 'source ~/.bashrc && ros2 launch curiosity_rover_demo mars_rover.launch.py'" &
bash -c 'source /home/spaceros-user/curiosity_ws/install/setup.bash && ros2 launch curiosity_rover_demo mars_rover.launch.py'" &
}

check_docker() {
Expand Down

0 comments on commit d92ae92

Please sign in to comment.