Change image names to osrf/space-ros-nav2 and osrf/space-ros-moveit2

Matt Hansen · Matt Hansen · commit 50313d6254a2 · 2025-08-25T17:01:13.000-07:00
diff --git a/moveit2/build.sh b/moveit2/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-ORG=openrobotics
-IMAGE=moveit2
+ORG=osrf
+IMAGE=space-ros-moveit2
 TAG=${MOVEIT2_TAG:-"latest"}
 
 VCS_REF=""
diff --git a/moveit2/run.sh b/moveit2/run.sh
@@ -5,7 +5,7 @@
 #   docker
 #   an X server
 
-IMG_NAME=openrobotics/moveit2
+IMG_NAME=osrf/space-ros-moveit2
 IMG_TAG=latest
 
 # Replace `/` with `_` to comply with docker container naming
diff --git a/nav2_demo/Dockerfile b/nav2_demo/Dockerfile
@@ -19,7 +19,7 @@
 #   VCS_REF     - The git revision of the Space ROS source code (no default value).
 #   VERSION     - The version of Space ROS (default: "preview")
 
-FROM osrf/space_nav2:latest
+FROM osrf/space-ros-nav2:latest
 
 # Define arguments used in the metadata definition
 ARG VCS_REF
diff --git a/nav2_demo/README.md b/nav2_demo/README.md
@@ -8,7 +8,7 @@ First build this container using the build script
 ./build.sh
 ```
 
-There will now be a docker image called "osrf/space_nav2_demo:latest".
+There will now be a docker image called "osrf/space-ros-nav2-demo:latest".
 
 ## Run the Mars Rover demo with Nav2 and SLAM toolbox
 
@@ -18,27 +18,27 @@ Follow the instructions to build and run the mars rover demo in [space-robots/RE
 
 ## Terminal 2 - launch Nav2
 
-Start the space_nav2 container and launch the navigation2 nodes:
+Start the space-ros-nav2 container and launch the navigation2 nodes:
 
 ```
 ./run.sh
-ros2 launch space_nav2_bringup navigation_launch.py use_sim_time:=True params_file:=nav2_params.yaml
+ros2 launch space-ros-nav2_bringup navigation_launch.py use_sim_time:=True params_file:=nav2_params.yaml
 ```
 
 ## Terminal 3 - launch localization with map
 
 ```
-docker exec -it osrf_space_nav2_demo bash
+docker exec -it osrf_space-ros-nav2-demo bash
 source install/setup.bash
-ros2 launch space_nav2_bringup localization_launch.py use_sim_time:=True map:=mars_map.yaml params_file:=nav2_params.yaml
+ros2 launch space-ros-nav2_bringup localization_launch.py use_sim_time:=True map:=mars_map.yaml params_file:=nav2_params.yaml
 ```
 
 ## Terminal 4 - launch Rviz
 
-Exec into the same space_nav2 container and launch Rviz2:
+Exec into the same space-ros-nav2 container and launch Rviz2:
 
 ```
-docker exec -it -e DISPLAY osrf_space_nav2_demo bash
+docker exec -it -e DISPLAY osrf_space-ros-nav2-demo bash
 source /opt/ros/humble/setup.bash
 source install/setup.bash
 ros2 launch nav2_bringup rviz_launch.py
diff --git a/nav2_demo/build.sh b/nav2_demo/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ORG=osrf
-IMAGE=space_nav2_demo
+IMAGE=space-ros-nav2-demo
 TAG=latest
 
 VCS_REF=""
diff --git a/nav2_demo/run.sh b/nav2_demo/run.sh
@@ -5,7 +5,7 @@
 #   docker
 #   an X server
 
-IMG_NAME=osrf/space_nav2_demo
+IMG_NAME=osrf/space-ros-nav2-demo
 IMG_TAG=latest
 
 # Replace `/` with `_` to comply with docker container naming
diff --git a/navigation2/README.md b/navigation2/README.md
@@ -2,7 +2,7 @@
 
 The Navigation2 Docker image uses the Space ROS docker image (*osrf/space-ros:latest*) as its base image.
 The Navigation2 Dockerfile installs all of the prerequisite system dependencies to build Navigation2.
-All the required nav2 packages are cloned and built from sources using the `navigation2.repos` file. The `nav2_rviz_plugins` and `nav2_bringup` packages together with their dependencies (Rviz, Gazebo, etc) are excluded to reduce package dependencies. The image also contains a custom `space_nav2_bringup` package that can be used as a starting point for creating mission-specific nav2 launch files.
+All the required nav2 packages are cloned and built from sources using the `navigation2.repos` file. The `nav2_rviz_plugins` and `nav2_bringup` packages together with their dependencies (Rviz, Gazebo, etc) are excluded to reduce package dependencies. The image also contains a custom `space-ros-nav2_bringup` package that can be used as a starting point for creating mission-specific nav2 launch files.
 
 ## Building the Navigation2 Image
 
@@ -34,11 +34,11 @@ The output will look something like this:
 
 ```
 REPOSITORY             TAG       IMAGE ID       CREATED          SIZE
-osrf/space_nav2        latest    c9b1693fbe5e   2 hours ago      3.79GB
+osrf/space-ros-nav2        latest    c9b1693fbe5e   2 hours ago      3.79GB
 osrf/space-ros         latest    18a3c6709c93   3 hours ago      1.37GB
 ```
 
-The new image is named **osrf/space_nav2:latest**.
+The new image is named **osrf/space-ros-nav2:latest**.
 
 There is a run.sh script provided for convenience that will run the spaceros image in a container.
 
diff --git a/navigation2/build.sh b/navigation2/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ORG=osrf
-IMAGE=space_nav2
+IMAGE=space-ros-nav2
 TAG=latest
 
 VCS_REF=""
diff --git a/navigation2/run.sh b/navigation2/run.sh
@@ -5,7 +5,7 @@
 #   docker
 #   an X server
 
-IMG_NAME=osrf/space_nav2
+IMG_NAME=osrf/space-ros-nav2
 IMG_TAG=latest
 
 # Replace `/` with `_` to comply with docker container naming
diff --git a/navigation2/src/space_nav2_bringup/CMakeLists.txt b/navigation2/src/space_nav2_bringup/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.8)
-project(space_nav2_bringup)
+project(space-ros-nav2_bringup)
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   add_compile_options(-Wall -Wextra -Wpedantic)
diff --git a/navigation2/src/space_nav2_bringup/launch/localization_launch.py b/navigation2/src/space_nav2_bringup/launch/localization_launch.py
@@ -28,7 +28,7 @@
 
 def generate_launch_description():
     # Get the launch directory
-    bringup_dir = get_package_share_directory('space_nav2_bringup')
+    bringup_dir = get_package_share_directory('space-ros-nav2_bringup')
 
     namespace = LaunchConfiguration('namespace')
     map_yaml_file = LaunchConfiguration('map')
diff --git a/navigation2/src/space_nav2_bringup/launch/navigation_launch.py b/navigation2/src/space_nav2_bringup/launch/navigation_launch.py
@@ -28,7 +28,7 @@
 
 def generate_launch_description():
     # Get the launch directory
-    bringup_dir = get_package_share_directory('space_nav2_bringup')
+    bringup_dir = get_package_share_directory('space-ros-nav2_bringup')
 
     namespace = LaunchConfiguration('namespace')
     use_sim_time = LaunchConfiguration('use_sim_time')
diff --git a/navigation2/src/space_nav2_bringup/package.xml b/navigation2/src/space_nav2_bringup/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>space_nav2_bringup</name>
+  <name>space-ros-nav2_bringup</name>
   <version>0.0.1</version>
   <description>Example bringup scripts for Navigation2 package running in SpaceROS</description>
   <maintainer email="fiderekblazej@gmail.com">Blazej Fiderek (xfiderek)</maintainer>
diff --git a/space_robots/Dockerfile b/space_robots/Dockerfile
@@ -19,7 +19,7 @@
 #   VCS_REF     - The git revision of the Space ROS source code (no default value).
 #   VERSION     - The version of Space ROS (default: "preview")
 
-FROM openrobotics/moveit2:latest
+FROM osrf/space-ros-moveit2:latest
 
 # Define arguments used in the metadata definition
 ARG VCS_REF
diff --git a/space_robots/README.md b/space_robots/README.md
@@ -1,6 +1,6 @@
 # Space ROS Space Robots Demo Docker Image
 
-The Space ROS Space Robots Demo docker image uses the moveit2 docker image (*openrobotics/moveit2:latest*) as its base image.
+The Space ROS Space Robots Demo docker image uses the moveit2 docker image (*osrf/space-ros-moveit2:latest*) as its base image.
 Build instructions for that image can be found in [this README](../moveit2/README.md).
 The Dockerfile installs all of the prerequisite system dependencies along with the demos source code, then builds the Space ROS Space Robots Demo.
 
