From 7360c78bfd40842016397e472df861b556a68695 Mon Sep 17 00:00:00 2001
From: Neeraj Pradhan <npradhan@uber.com>
Date: Tue, 4 Dec 2018 22:19:45 -0800
Subject: [PATCH] Minor updates to the docker scripts

---
 docker/Dockerfile | 4 ++--
 docker/install.sh | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index b9220c316c..37d66a54aa 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -35,8 +35,8 @@ USER ${USER_NAME}
 RUN curl -o ~/miniconda.sh -O \
     https://repo.continuum.io/miniconda/Miniconda${python_version%%.*}-latest-Linux-x86_64.sh && \
     bash ~/miniconda.sh -f -b -p ${CONDA_DIR} && \
-    rm ~/miniconda.sh
-ENV CMAKE_PREFIX_PATH="$(dirname $(which conda))/../"
+    rm ~/miniconda.sh && \
+    conda install python=${python_version}
 
 # Move to home directory; and copy the install script
 WORKDIR ${WORK_DIR}
diff --git a/docker/install.sh b/docker/install.sh
index 8d6683492b..daaabd3e4a 100755
--- a/docker/install.sh
+++ b/docker/install.sh
@@ -14,6 +14,7 @@ then
     if [ ${cuda} = 1 ]; then conda install -y cuda90 -c pytorch; fi
 else
     conda install -y numpy pyyaml mkl mkl-include setuptools cmake cffi typing
+    conda install -c mingfeima mkldnn
     if [ ${cuda} = 1 ]; then conda install -y cuda90 -c pytorch; fi
     git clone --recursive https://github.com/pytorch/pytorch.git
     pushd pytorch && git checkout ${pytorch_branch}