Merge pull request #60 from MetaCell/dockerfile_fix

updated to Dockerfile_dev to make rxd work

Author: tarelli

Dockerfile_dev

@@ -1,8 +1,8 @@
 FROM jupyter/base-notebook:eb70bcf1a292
 USER root
 
-ARG netpyneuiBranch=development	
-ENV netpyneuiBranch=${netpyneuiBranch}	
+ARG netpyneuiBranch=development 
+ENV netpyneuiBranch=${netpyneuiBranch}  
 RUN echo "$netpyneuiBranch";
 
 RUN apt-get -qq update
@@ -13,7 +13,7 @@ RUN apt-get install -y \
         g++ \
         build-essential \
         libncurses-dev \
-        python \
+        python2.7 \
         libpython-dev \
         cython \
         libx11-dev \
@@ -24,28 +24,21 @@ RUN apt-get install -y \
         libtool \ 
         libxext-dev \
         libncurses-dev \
-        python3-dev \
+        python2.7-dev \
         xfonts-100dpi \ 
-        cython3 \ 
         libopenmpi-dev \
-        python3-scipy \
+        python2.7-scipy \
         make \
         zlib1g-dev \
         unzip \
         vim \
         libpng-dev
 
 # Install latest iv and NEURON
-RUN git clone http://github.com/neuronsimulator/iv
-RUN git clone --branch 7.6.1crxd https://github.com/adamjhn/nrn.git 
-WORKDIR iv
+RUN git clone --branch 7.6.1crxd https://github.com/adamjhn/nrn.git
+WORKDIR nrn
 RUN ./build.sh
-RUN ./configure --prefix="/home/jovyan/work/iv/"
-RUN make --silent -j4
-RUN make --silent install -j4
-WORKDIR ../nrn
-RUN ./build.sh
-RUN ./configure --with-nrnpython=python2 --with-paranrn --prefix="/home/jovyan/work/nrn/" --with-iv="/home/jovyan/work/iv/"
+RUN ./configure --without-x --with-nrnpython=python2 --without-paranrn --prefix="/home/jovyan/work/nrn/" --without-iv
 RUN make --silent -j4
 RUN make --silent install -j4
 
@@ -72,4 +65,4 @@ RUN /bin/bash -c "source activate snakes && exec python install.py branch $netpy
 WORKDIR /home/jovyan
 RUN git clone https://github.com/Neurosim-lab/netpyne_workspace
 WORKDIR /home/jovyan/netpyne_workspace
-CMD /bin/bash -c "source activate snakes && exec jupyter notebook --debug --NotebookApp.default_url=/geppetto --NotebookApp.token=''"
+CMD /bin/bash -c "source activate snakes && exec jupyter notebook --debug --NotebookApp.default_url=/geppetto --NotebookApp.token=''"