From 521519c1c625da5ebe8c525a1b0c99a0921aa285 Mon Sep 17 00:00:00 2001
From: Athanasios Tasoglou <tasoglou@gmail.com>
Date: Mon, 29 Jul 2019 17:45:33 +0200
Subject: [PATCH] Update NVIDIA packages

---
 nvidia/indigo/cuda10/Dockerfile        | 12 ++++++------
 nvidia/indigo/cuda10/cudnn7/Dockerfile |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nvidia/indigo/cuda10/Dockerfile b/nvidia/indigo/cuda10/Dockerfile
index d9127a1..9d968b3 100644
--- a/nvidia/indigo/cuda10/Dockerfile
+++ b/nvidia/indigo/cuda10/Dockerfile
@@ -28,23 +28,24 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     ln -s cuda-10.0 /usr/local/cuda && \
     rm -rf /var/lib/apt/lists/*
 
-ENV PATH /usr/local/cuda/bin:${PATH}
+ENV PATH /usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}
+ENV LD_LIBRARY_PATH /usr/local/nvidia/lib:/usr/local/nvidia/lib64
 
 ## nvidia-container-runtime
 ENV NVIDIA_VISIBLE_DEVICES all
 # ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
 ENV NVIDIA_DRIVER_CAPABILITIES all
-ENV NVIDIA_REQUIRE_CUDA "cuda>=10.0 brand=tesla,driver>=384,driver<385"
+ENV NVIDIA_REQUIRE_CUDA "cuda>=10.0 brand=tesla,driver>=384,driver<385 brand=tesla,driver>=410,driver<411"
 
 
 # CUDA Runtime-packages
-ENV NCCL_VERSION 2.3.5
+ENV NCCL_VERSION 2.4.2
 LABEL com.turlucode.ros.nccl="${NCCL_VERSION}"
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         cuda-libraries-$CUDA_PKG_VERSION \
         cuda-nvtx-$CUDA_PKG_VERSION \
-        libnccl2=$NCCL_VERSION-2+cuda10.0 && \
+        libnccl2=$NCCL_VERSION-1+cuda10.0 && \
     apt-mark hold libnccl2 && \
     rm -rf /var/lib/apt/lists/*
 
@@ -55,9 +56,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         cuda-nvml-dev-$CUDA_PKG_VERSION \
         cuda-minimal-build-$CUDA_PKG_VERSION \
         cuda-command-line-tools-$CUDA_PKG_VERSION \
-        libnccl-dev=$NCCL_VERSION-2+cuda10.0 && \
+        libnccl-dev=$NCCL_VERSION-1+cuda10.0 && \
     rm -rf /var/lib/apt/lists/*
-ENV LIBRARY_PATH /usr/local/cuda/lib64/stubs
 
 
 # Launch terminator
diff --git a/nvidia/indigo/cuda10/cudnn7/Dockerfile b/nvidia/indigo/cuda10/cudnn7/Dockerfile
index 170e7d6..05134b2 100644
--- a/nvidia/indigo/cuda10/cudnn7/Dockerfile
+++ b/nvidia/indigo/cuda10/cudnn7/Dockerfile
@@ -7,7 +7,7 @@ LABEL Description="ROS-Indigo-Desktop with CUDA 10 and cuDNN 7 support (Ubuntu 1
 ENV DEBIAN_FRONTEND noninteractive 
 
 ## CUDNN Runtime-packages
-ENV CUDNN_VERSION 7.3.1.20
+ENV CUDNN_VERSION 7.6.0.64
 LABEL com.turlucode.ros.cudnn="${CUDNN_VERSION}"
 
 RUN apt-get update && apt-get install -y --no-install-recommends \