diff --git a/docker-compose.yaml b/docker-compose.yaml index 7e624344c..718f69e58 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,11 +6,11 @@ include: services: docs: # live mkdocs container. open localhost:8000 in browser to see the docs - image: mkdocs_with_plugins + image: airlab-storage.andrew.cmu.edu:5001/shared/mkdocs_with_plugins build: dockerfile: docs/Dockerfile tags: - - mkdocs_with_plugins + - airlab-storage.andrew.cmu.edu:5001/shared/mkdocs_with_plugins container_name: docs ports: - "8000:8000" diff --git a/simulation/isaac-sim/docker/Dockerfile.isaac-ros b/simulation/isaac-sim/docker/Dockerfile.isaac-ros index 2a87aa2cb..fb7fc3ce9 100644 --- a/simulation/isaac-sim/docker/Dockerfile.isaac-ros +++ b/simulation/isaac-sim/docker/Dockerfile.isaac-ros @@ -63,12 +63,12 @@ RUN cd /tmp/ && \ rm -rf /tmp/IsaacSim-ros_workspaces-main # copy over the AscentAeroSystemsSITLPackage -COPY docker/isaac-sim/AscentAeroSystemsSITLPackage /AscentAeroSystemsSITLPackage +COPY sitl_integration/AscentAeroSystemsSITLPackage /AscentAeroSystemsSITLPackage # the user.config.json file specifies to auto load the SITL extensions -COPY docker/isaac-sim/user.config.json /root/.local/share/ov/data/Kit/Isaac-Sim/4.1/user.config.json +COPY docker/user.config.json /root/.local/share/ov/data/Kit/Isaac-Sim/4.1/user.config.json -COPY ros_ws/fastdds.xml /isaac-sim/fastdds.xml +COPY docker/fastdds.xml /isaac-sim/fastdds.xml # Cleanup. Prevent people accidentally doing git commits as root in Docker RUN apt purge -y git && apt autoremove -y \ diff --git a/simulation/isaac-sim/docker/docker-compose.yaml b/simulation/isaac-sim/docker/docker-compose.yaml index 6dd5e68e6..a12557f4a 100644 --- a/simulation/isaac-sim/docker/docker-compose.yaml +++ b/simulation/isaac-sim/docker/docker-compose.yaml @@ -1,7 +1,7 @@ services: # ============================================================================== isaac-sim: - image: &isaac-sim-image airlab-storage.andrew.cmu.edu:5001/shared/isaac-sim_ros-humble:v1.0.2 + image: &isaac-sim-image airlab-storage.andrew.cmu.edu:5001/shared/isaac-sim_ros-humble:v1.0.3 build: context: ../ dockerfile: docker/Dockerfile.isaac-ros diff --git a/simulation/isaac-sim/docker/fastdds.xml b/simulation/isaac-sim/docker/fastdds.xml new file mode 100644 index 000000000..d9d106bb2 --- /dev/null +++ b/simulation/isaac-sim/docker/fastdds.xml @@ -0,0 +1,23 @@ + + + + + + UdpTransport + UDPv4 + + + + + + + UdpTransport + + + + + + false + + +