Merge pull request #140 from facebookresearch/fix-errors

Fix small errors in Jenkins CI docker

Author: prigoyal

.jenkins/build.sh

@@ -11,6 +11,7 @@ source /etc/lsb-release
 if [[ "$DISTRIB_RELEASE" == 14.04 ]]; then
   if which conda &> /dev/null; then
     echo "Building TC in conda env"
+    source activate
     conda install -y -c pytorch pytorch
     conda install -y pyyaml
     WITH_PYTHON_C2=OFF CLANG_PREFIX=/usr/local/clang+llvm-tapir5.0 BUILD_TYPE=Release ./build.sh --all
@@ -23,6 +24,7 @@ fi
 if [[ "$DISTRIB_RELEASE" == 16.04 ]]; then
   if which conda &> /dev/null; then
     echo "Building TC in conda env"
+    source activate
     conda install -y pytorch cuda90 -c pytorch
     conda install -y pyyaml
     WITH_PYTHON_C2=OFF CLANG_PREFIX=/usr/local/clang+llvm-tapir5.0 BUILD_TYPE=Release ./build.sh --all

docker/common/add_jenkins_user.sh

@@ -2,6 +2,9 @@
 
 set -ex
 
+apt-get update
+apt-get install sudo
+
 # Mirror jenkins user in container
 echo "jenkins:x:$JENKINS_UID:$JENKINS_GID::/var/lib/jenkins:" >> /etc/passwd
 echo "jenkins:x:$JENKINS_GID:" >> /etc/group

docker/ubuntu-cuda-conda/Dockerfile

@@ -59,7 +59,4 @@ RUN python --version
 RUN which cmake
 RUN cmake --version
 
-# activate the root conda environment
-RUN source activate
-
 CMD ["bash"]