Skip to content

Commit

Permalink
feat(aloha_ws): Remove unnecessary vulkan config files and use `RUN c…
Browse files Browse the repository at this point in the history
  • Loading branch information
j3soon committed Sep 15, 2024
1 parent 16a1d04 commit 5008bf2
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 53 deletions.
1 change: 0 additions & 1 deletion aloha_ws/docker/.dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
*
!.bashrc
!isaac-sim-4.1.0
!script
!udev_rules
23 changes: 11 additions & 12 deletions aloha_ws/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,12 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
# Ref: https://wiki.debian.org/Mesa
# - `vulkan-tools` for `vkcube` and `vulkaninfo`
# Ref: https://docs.vulkan.org/tutorial/latest/02_Development_environment.html#_vulkan_packages
# Ref: https://gitlab.com/nvidia/container-images/vulkan/-/blob/master/docker/Dockerfile.ubuntu
RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
apt-get update && apt-get install -y \
x11-apps x11-utils \
mesa-utils \
vulkan-tools \
&& rm -rf /var/lib/apt/lists/*

# Install libGL
# Ref: https://gitlab.com/nvidia/container-images/vulkan/-/blob/master/docker/Dockerfile.ubuntu
RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
apt-get update && apt-get install -y \
libgl1 \
libgl1 vulkan-tools \
&& rm -rf /var/lib/apt/lists/*

# Setup the required capabilities for the container runtime
Expand All @@ -86,10 +80,15 @@ ENV NVIDIA_DRIVER_CAPABILITIES=all

# Install Vulkan config files
# Ref: https://gitlab.com/nvidia/container-images/vulkan
COPY isaac-sim-4.1.0/10_nvidia.json /usr/share/glvnd/egl_vendor.d/10_nvidia.json
COPY isaac-sim-4.1.0/50_mesa.json /usr/share/glvnd/egl_vendor.d/50_mesa.json
COPY isaac-sim-4.1.0/nvidia_icd.json /etc/vulkan/icd.d/nvidia_icd.json
COPY isaac-sim-4.1.0/nvidia_layers.json /etc/vulkan/implicit_layer.d/nvidia_layers.json
RUN cat > /etc/vulkan/icd.d/nvidia_icd.json <<EOF
{
"file_format_version" : "1.0.0",
"ICD": {
"library_path": "libGLX_nvidia.so.0",
"api_version" : "1.3.194"
}
}
EOF

# Install ROS2 Gazebo packages for amd64
RUN --mount=type=cache,target=/var/cache/apt,sharing=private \
Expand Down
6 changes: 0 additions & 6 deletions aloha_ws/docker/isaac-sim-4.1.0/10_nvidia.json

This file was deleted.

6 changes: 0 additions & 6 deletions aloha_ws/docker/isaac-sim-4.1.0/50_mesa.json

This file was deleted.

7 changes: 0 additions & 7 deletions aloha_ws/docker/isaac-sim-4.1.0/nvidia_icd.json

This file was deleted.

21 changes: 0 additions & 21 deletions aloha_ws/docker/isaac-sim-4.1.0/nvidia_layers.json

This file was deleted.

0 comments on commit 5008bf2

Please sign in to comment.