Skip to content

Commit

Permalink
update Docker configurations to use CUDA-based tags and enhance nvidi…
Browse files Browse the repository at this point in the history
…a.dockerfile with additional dependencies
  • Loading branch information
marc-hanheide committed Jan 1, 2025
1 parent 4f0ef08 commit 593c44f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-build-opengl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

- base_image: nvidia/cuda:12.6.3-cudnn-devel-ubuntu24.04
ros_distro: rolling
push_tag: noble-rolling-12.6.3-opengl
push_tag: noble-rolling-cuda12.6-opengl

steps:
- name: Node Js
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:

- base_image: nvidia/cuda:12.6.3-cudnn-devel-ubuntu24.04
ros_distro: rolling
push_tag: noble-rolling-12.6.3-opengl-arm64
push_tag: noble-rolling-cuda12.6-opengl-arm64

steps:
- name: Node Js
Expand Down
3 changes: 2 additions & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
lcas_desktop:
image: lcas.lincoln.ac.uk/lcas/ros:noble-rolling-12.6.3-opengl
image: lcas.lincoln.ac.uk/lcas/ros:noble-rolling-cuda12.6-opengl
restart: unless-stopped
build:
context: .
Expand All @@ -12,6 +12,7 @@ services:
- "${VNC_PORT:-5801}:5801"
command: bash -c "while true; do sleep 5; done"
volumes:
# persist user's home
- user_home:/home/ros

volumes:
Expand Down
7 changes: 5 additions & 2 deletions nvidia.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,13 @@ RUN curl -L -O https://github.com/TurboVNC/turbovnc/releases/download/3.1.1/turb
RUN addgroup --gid 1002 vglusers && adduser ros video && adduser ros vglusers
RUN apt-get update && \
apt-get -y install xfce4-session xfce4-panel xfce4-terminal thunar xterm x11-utils python3-minimal python3-pip python3-numpy python3-venv unzip less tmux screen \
geany-plugins geany && \
geany-plugins geany \
ros-${ROS_DISTRO}-rmw-cyclonedds-cpp \
&& \
rm -rf /var/lib/apt/lists/*

ENV DEBIAN_FRONTEND=
ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp


# Install noVNC

Expand Down

0 comments on commit 593c44f

Please sign in to comment.