Skip to content

Commit a47d813

Browse files
committed
Upgrade isaac to 4.2.0; also enable world loading and play at start
1 parent cb51785 commit a47d813

File tree

5 files changed

+18
-11
lines changed

5 files changed

+18
-11
lines changed

.env

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
PROJECT_NAME=airstack
2-
PROJECT_VERSION=1.0.0
1+
PROJECT_NAME="airstack"
2+
PROJECT_VERSION="1.0.0"
33
# can replace with your docker hub username
4-
PROJECT_DOCKER_REGISTRY="airlab-storage.andrew.cmu.edu:5001/shared"
4+
PROJECT_DOCKER_REGISTRY="airlab-storage.andrew.cmu.edu:5001/shared"
5+
DEFAULT_ISAAC_SCENE="omniverse://airlab-storage.andrew.cmu.edu:8443/Projects/AirStack/fire_academy.scene.usd"
6+
PLAY_SIM_ON_START="true"

docs/getting_started.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ xhost + # allow docker access to X-Server
8484
docker compose up -d
8585
```
8686

87-
Then open the stage from the Nucleus server:
88-
`airlab-storage.andrew.cmu.edu:8443/Projects/AirStack/neighborhood.scene.usd`
87+
This will automatically launch and play the Isaac scene specified under `AirStack/.env` (default is the Fire Academy).
8988

9089
## Move Robot
9190

robot/docker/docker-compose.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
services:
33
# ===================================================================================================================
44
# for developing locally on a single machine
5-
robot_sim:
5+
# note, this service name is currently used as the name of the robot
6+
robot:
67
profiles:
78
- ""
89
- sitl

simulation/isaac-sim/docker/Dockerfile.isaac-ros

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
# expects context to be the root of the repository, i.e. AirStack/. this is so we can access AirStack/ros_ws/
2-
FROM nvcr.io/nvidia/isaac-sim:4.1.0
2+
FROM nvcr.io/nvidia/isaac-sim:4.2.0
33

44
WORKDIR /isaac-sim
55

6+
# isaac's ros2 launch run_isaacsim.launch.py hardcodes to search in this path, so we have to put the executables here
7+
RUN mkdir -p /root/.local/share/ov/pkg/
8+
RUN ln -s /isaac-sim /root/.local/share/ov/pkg/isaac-sim-4.2.0
9+
# allows us to run isaac-sim as root
10+
ENV OMNI_KIT_ALLOW_ROOT=1
11+
612
# setup timezone
713
RUN echo 'Etc/UTC' > /etc/timezone && \
814
ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime && \

simulation/isaac-sim/docker/docker-compose.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ services:
1010
entrypoint: "" # override the default entrypoint with nothing
1111
# for some reason the tmux session manager only works when isaac is running in tmux
1212
command: >
13-
bash -c "
14-
tmux new -d -s isaac
15-
&& tmux send-keys -t isaac 'runapp' ENTER
13+
bash -c " tmux new -d -s isaac
14+
&& tmux send-keys -t isaac \"ros2 launch isaacsim run_isaacsim.launch.py gui:=${DEFAULT_ISAAC_SCENE} play_sim_on_start:=${PLAY_SIM_ON_START}\" ENTER
1615
&& sleep infinity"
1716
# Interactive shell
1817
stdin_open: true # docker run -i
@@ -53,7 +52,7 @@ services:
5352
- ~/docker/isaac-sim/logs:/root/.nvidia-omniverse/logs:rw
5453
- ~/docker/isaac-sim/data:/root/.local/share/ov/data:rw
5554
- ~/docker/isaac-sim/documents:/root/Documents:rw
56-
- ./user.config.json:/root/.local/share/ov/data/Kit/Isaac-Sim/4.1/user.config.json:rw
55+
- ./user.config.json:/root/.local/share/ov/data/Kit/Isaac-Sim/4.2/user.config.json:rw
5756
- ./ui.py:/isaac-sim/kit/exts/omni.kit.widget.nucleus_connector/omni/kit/widget/nucleus_connector/ui.py:rw
5857
# developer stuff
5958
- .dev:/root/.dev:rw # developer config

0 commit comments

Comments
 (0)