diff --git a/README.md b/README.md index 16b49b80a958477e8a4ce97258cdc7511b485d0d..384322a215f96e91f0a6d2944fb790e1a0a131ed 100644 --- a/README.md +++ b/README.md @@ -12,12 +12,12 @@ To install a development environment, follow these steps: - [Log in to the Docker Registry](doc/docker_login.md) using a Deploy Key or Gitlab user/keyword +- [Install Nvidia Docker drivers](doc/docker_nvidia.md) if you have an Nvidia graphics card and you are not using a virtual machine +- ## Development Environments -- [Prepare Existing ROS Computer](doc/prepare_ros_computer.md) - - [Using a Local ROS Installation with LRS Docker Modules](doc/local_ros_installation.md) diff --git a/doc/docker_nvidia.md b/doc/docker_nvidia.md new file mode 100644 index 0000000000000000000000000000000000000000..8fbe75f20234e8beebaee094f994f2f13e74a0d5 --- /dev/null +++ b/doc/docker_nvidia.md @@ -0,0 +1,15 @@ +# Installing Nvidia Drivers for Docker + +If you are **not** using a virtual machine (you run Ubuntu LTS directly on your computer), and you have an nVidia graphics card, you can get 3D-accelerated graphics according to [these instructions](https://github.com/NVIDIA/nvidia-docker). + +Alternatively, do the following (though the web page linked above may be more up to date): + +```bash +# Add the package repositories +distribution=$(. /etc/os-release;echo $ID$VERSION_ID) +curl -s -L https://nvidia.github.io/nvidia-docker/gpgkey | sudo apt-key add - +curl -s -L https://nvidia.github.io/nvidia-docker/$distribution/nvidia-docker.list | sudo tee /etc/apt/sources.list.d/nvidia-docker.list + +sudo apt-get update && sudo apt-get install -y nvidia-docker2 +sudo systemctl restart docker +``` diff --git a/doc/prepare_ros_computer.md b/doc/prepare_ros_computer.md index 1528e76ea99db0f4b5e41044d70b513b3bf6a29c..36b6740f9bbe7d7c3a7bd4c92d5fd811a474e0fe 100644 --- a/doc/prepare_ros_computer.md +++ b/doc/prepare_ros_computer.md @@ -1,5 +1,7 @@ # Prepare Existing Computer ++++++++++++++++ Obsolete? ++++++++++++++++++++ + If you already have a ROS computer with a docker daeamon follow the instructions below. @@ -40,19 +42,3 @@ git clone https://gitlab.liu.se/lrs/lrs_srvs_cons.git git clone https://gitlab.liu.se/lrs/lrs_wara_gazebo.git git clone https://gitlab.liu.se/lrs/lrs_common.git ``` - -### NVIDIA drivers Docker - -To get nvidia graphics to work in docker see: -- https://github.com/NVIDIA/nvidia-docker - -or just do: -```bash -# Add the package repositories -distribution=$(. /etc/os-release;echo $ID$VERSION_ID) -curl -s -L https://nvidia.github.io/nvidia-docker/gpgkey | sudo apt-key add - -curl -s -L https://nvidia.github.io/nvidia-docker/$distribution/nvidia-docker.list | sudo tee /etc/apt/sources.list.d/nvidia-docker.list - -sudo apt-get update && sudo apt-get install -y nvidia-docker2 -sudo systemctl restart docker -``` \ No newline at end of file