Merge pull request #489 from PickNikRobotics/fix-dockerfile

JWhitleyWork · web-flow · commit dcb8948a7244 · 2026-01-29T10:50:55.000-07:00
Add ROS Distro to Dockerfile Base
diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@
 #
 
 # Specify the MoveIt Pro release to build on top of.
-ARG MOVEIT_PRO_BASE_IMAGE=picknikciuser/moveit-studio:${MOVEIT_DOCKER_TAG:-main}
+ARG MOVEIT_PRO_BASE_IMAGE=picknikciuser/moveit-studio:${MOVEIT_DOCKER_TAG:-main}-${MOVEIT_ROS_DISTRO:-humble}
 ARG USERNAME=moveit-pro-user
 ARG USER_UID=1000
 ARG USER_GID=1000

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#`
`7`	`7`
`8`	`8`	`# Specify the MoveIt Pro release to build on top of.`
`9`		`-ARG MOVEIT_PRO_BASE_IMAGE=picknikciuser/moveit-studio:${MOVEIT_DOCKER_TAG:-main}`
	`9`	`+ARG MOVEIT_PRO_BASE_IMAGE=picknikciuser/moveit-studio:${MOVEIT_DOCKER_TAG:-main}-${MOVEIT_ROS_DISTRO:-humble}`
`10`	`10`	`ARG USERNAME=moveit-pro-user`
`11`	`11`	`ARG USER_UID=1000`
`12`	`12`	`ARG USER_GID=1000`