Merge pull request #4230 from caisq/fix-docker-build-1

Fix nightly docker builds

tensorflow/tools/docker/Dockerfile

@@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         python \
         python-dev \
         rsync \
+        software-properties-common \
         unzip \
         && \
     apt-get clean && \

tensorflow/tools/docker/Dockerfile.devel-gpu

@@ -85,8 +85,10 @@ RUN git clone -b r0.10 --recursive --recurse-submodules https://github.com/tenso
 WORKDIR /tensorflow
 
 # Configure the build for our CUDA configuration.
+ENV CUDA_PATH /usr/local/cuda
 ENV CUDA_TOOLKIT_PATH /usr/local/cuda
-ENV CUDNN_INSTALL_PATH /usr/local/cuda
+ENV CUDNN_INSTALL_PATH /usr/lib/x86_64-linux-gnu
+ENV LD_LIBRARY_PATH /usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64
 ENV TF_NEED_CUDA 1
 
 RUN ./configure && \
@@ -96,9 +98,6 @@ RUN ./configure && \
 
 WORKDIR /root
 
-# Set up CUDA variables
-ENV CUDA_PATH /usr/local/cuda
-
 # TensorBoard
 EXPOSE 6006
 # IPython

tensorflow/tools/docker/Dockerfile.gpu

@@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         python \
         python-dev \
         rsync \
+        software-properties-common \
         unzip \
         && \
     apt-get clean && \