Merge pull request #159 from facebookresearch/fix-docker-trusty

fix flaky errors in trusty conda docker image

Author: prigoyal

docker/common/install_base.sh

@@ -3,6 +3,9 @@
 set -ex
 
 # Install common dependencies
+# cleanup again to avoid any sha mismatch
+apt-get clean
+rm -rf /var/lib/apt/lists/*
 apt-get update
 apt-get install -y --no-install-recommends \
   curl \
@@ -27,6 +30,9 @@ apt-get install -y --no-install-recommends \
   software-properties-common \
   build-essential
 
+# cleanup again to avoid any sha mismatch
+apt-get clean
+rm -rf /var/lib/apt/lists/*
 # setup gcc
 add-apt-repository ppa:ubuntu-toolchain-r/test
 apt-get update

docker/ubuntu-cuda-conda/Dockerfile

@@ -6,8 +6,6 @@ FROM nvidia/cuda:${CUDA_VERSION}-cudnn${CUDNN_VERSION}-devel-ubuntu${UBUNTU_VERS
 
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get update
-
 # CUDA paths - we install cudnn ourselves (only Trusty) so we can match the version with
 # PyTorch conda install
 ARG CUDA_VERSION
@@ -22,6 +20,8 @@ ARG GCC_VERSION
 ARG CMAKE_VERSION
 ADD ./common/install_base.sh install_base.sh
 RUN bash ./install_base.sh && rm install_base.sh
+
+# Setup ccache env variables
 ENV PATH /usr/local/bin/ccache:$PATH
 ENV CUDA_NVCC_EXECUTABLE /usr/local/bin/nvcc
 ENV PATH /usr/local/cuda/bin:$PATH

docker/ubuntu-cuda/Dockerfile

@@ -6,8 +6,6 @@ FROM nvidia/cuda:${CUDA_VERSION}-cudnn${CUDNN_VERSION}-devel-ubuntu${UBUNTU_VERS
 
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get update
-
 # CUDA paths
 ENV LD_LIBRARY_PATH /usr/local/cuda/lib64:/usr/local/cuda/targets/x86_64-linux/lib/stubs/:$LD_LIBRARY_PATH
 ENV PATH /usr/local/bin:/usr/local/cuda/bin:$PATH
@@ -17,6 +15,8 @@ ARG GCC_VERSION
 ARG CMAKE_VERSION
 ADD ./common/install_base.sh install_base.sh
 RUN bash ./install_base.sh && rm install_base.sh
+
+# Setup ccache env variables
 ENV PATH /usr/local/bin/ccache:$PATH
 ENV CUDA_NVCC_EXECUTABLE /usr/local/bin/nvcc
 ENV PATH /usr/local/cuda/bin:$PATH