Skip to content

added PROJECT_ROOT handling for project-based isaac configs #174

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+20 −1
Open

added PROJECT_ROOT handling for project-based isaac configs #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdd8bb3
added PROJECT_ROOT handling for project-based isaac configs
Feb 7, 2025
d2aad57
added progress plain as default
Mar 6, 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
8 changes: 8 additions & 0 deletions scripts/build_image_layers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ if [[ -f ~/.isaac_ros_common-config ]]; then
. ~/.isaac_ros_common-config
fi

# Override with config from project directory if exists (and is defined)
if [[ ! -z "${PROJECT_ROOT}" ]]; then
print_info "Sourcing project config at: ${PROJECT_ROOT}"
if [[ -f "${PROJECT_ROOT}/.isaac_ros_common-config" ]]; then
. "${PROJECT_ROOT}/.isaac_ros_common-config"
fi
fi

# Prepend configured docker search dirs
if [ ${#CONFIG_DOCKER_SEARCH_DIRS[@]} -gt 0 ]; then
for (( i=${#CONFIG_DOCKER_SEARCH_DIRS[@]}-1 ; i>=0 ; i-- )); do
Expand Down
13 changes: 12 additions & 1 deletion scripts/run_dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,17 @@ if [[ -f ~/.isaac_ros_common-config ]]; then
. ~/.isaac_ros_common-config
fi

# Override with config from project directory if exists (and is defined)
if [[ ! -z "${PROJECT_ROOT}" ]]; then
print_info "Sourcing project config at: ${PROJECT_ROOT}"
if [[ -f "${PROJECT_ROOT}/.isaac_ros_common-config" ]]; then
. "${PROJECT_ROOT}/.isaac_ros_common-config"
fi

# Make the project root available to nested scripts, eg. build_image_layers.sh
export PROJECT_ROOT="${PROJECT_ROOT}"
fi

# Parse command-line args
IMAGE_KEY=ros2_humble

Expand Down Expand Up @@ -202,7 +213,7 @@ print_info "Launching Isaac ROS Dev container with image key ${BASE_IMAGE_KEY}:
# Build image to launch
if [[ $SKIP_IMAGE_BUILD -ne 1 ]]; then
print_info "Building $BASE_IMAGE_KEY base as image: $BASE_NAME"
$ROOT/build_image_layers.sh --image_key "$BASE_IMAGE_KEY" --image_name "$BASE_NAME"
$ROOT/build_image_layers.sh --image_key "$BASE_IMAGE_KEY" --image_name "$BASE_NAME" -d "--progress=plain" # -d "--no-cache"

# Check result
if [ $? -ne 0 ]; then
Expand Down