From 16b8c27f7882cc18ae77e9bdbd94bf942175b05d Mon Sep 17 00:00:00 2001 From: Xiangquan Xiao Date: Tue, 3 Dec 2019 13:37:29 -0800 Subject: [PATCH] Docs: Update docker related references. --- README.md | 8 +++----- docs/demo_guide/README.md | 3 ++- docs/howto/how_to_build_and_release.md | 6 +----- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 9da1079bd76..067f67b0e84 100644 --- a/README.md +++ b/README.md @@ -36,11 +36,9 @@ Apollo 5.0 is loaded with new modules and features but needs to be calibrated an **[Attention]** The Apollo team is proud to announce that the platform has been migrated to Ubuntu 18.04, one of the most requested upgrades from our developers. We do not expect a disruption to your current work with the Apollo platform, but for perception related code, you would need to: 1. Upgrade host to ubuntu_16.04 and above (Ubuntu 18.04 is preferred) -2. Update local host NVIDIA driver >=410.48. [Website link](https://www.nvidia.com/Download/index.aspx?lang=en-us). -Other alternatives are also possible for this step - 1-follow the [guide](https://github.com/ApolloAuto/apollo-kernel/tree/master/linux/Install_nvidia_driver_on_ubuntu_18.04.md) to install Apollo-Kernel and NVIDIA driver, if you want to install Apollo-Kernel. - 2-use Ubuntu apt to install the Nvidia drivers [guide](https://www.linuxbabe.com/ubuntu/install-nvidia-driver-ubuntu-18-04) however even if more convenient this way is new and only works for LTS veesions (16.04 and 18.04) sonprocced with caution. -3. Install NVIDIA-docker 2.0 - you can refer to [this link](https://github.com/nvidia/nvidia-docker/wiki/Installation-(version-2.0)) for steps on installation, or use the install scripts we provide [here](https://github.com/ApolloAuto/apollo/blob/master/docker/setup_host/install_nvidia_docker.sh) +2. Update local host NVIDIA driver >=410.48. [Website link](https://www.nvidia.com/Download/index.aspx?lang=en-us). Or follow the [guide](https://github.com/ApolloAuto/apollo-kernel/tree/master/linux/Install_nvidia_driver_on_ubuntu_18.04.md) to install Apollo-Kernel and NVIDIA driver, if you want to install Apollo-Kernel. +3. Install latest Docker-CE (19.03+) by following the [official doc](https://docs.docker.com/install/linux/docker-ce/ubuntu). +4. Install latest nvidia-container-toolkit by following the [official doc](https://github.com/NVIDIA/nvidia-docker). For those developers that would like to continue working with Ubuntu 14.04, please use the [Ubuntu 14.04 branch](https://github.com/ApolloAuto/apollo/tree/ubuntu_14.04) instead of the master branch. diff --git a/docs/demo_guide/README.md b/docs/demo_guide/README.md index 03310360ea5..a603aa6afeb 100644 --- a/docs/demo_guide/README.md +++ b/docs/demo_guide/README.md @@ -3,7 +3,8 @@ Apollo provides a method to run simulation if you do not have the required hardware. -First fork and then clone Apollo's GitHub code and then set up the docker release environment by following the instructions in the +First fork and then clone Apollo's GitHub code and then set up the docker +release environment by following the instructions in the [Install docker](https://github.com/ApolloAuto/apollo/blob/master/docs/howto/how_to_build_and_release.md#docker) section of the [Build and Release](https://github.com/ApolloAuto/apollo/blob/master/docs/howto/how_to_build_and_release.md) diff --git a/docs/howto/how_to_build_and_release.md b/docs/howto/how_to_build_and_release.md index 419d25759f4..66d597a5a1d 100644 --- a/docs/howto/how_to_build_and_release.md +++ b/docs/howto/how_to_build_and_release.md @@ -8,12 +8,8 @@ * [6. Legal Disclaimer](#legal-disclaimer) ## Install Docker -The system requirement for building Apollo is Ubuntu 14.04. Using a Docker container is the simplest way to set up the build environment for Apollo project. A Detailed docker tutorial can be found [here](https://docs.docker.com/). -To install docker, you may refer to -[Official guide to install the Docker-ce](https://docs.docker.com/install/linux/docker-ce/ubuntu). -Don't forget to test it using -[post-installation steps for Linux](https://docs.docker.com/install/linux/linux-postinstall). +Please follow the [Apollo Software Installation Guide](https://github.com/ApolloAuto/apollo/blob/master/docs/quickstart/apollo_software_installation_guide.md#Set-up-the-Docker-environment). ## Build Apollo