Skip to content

Commit ca1ce2c

Browse files
committed
tentative update dockerfile and clean up dockerfile dev
1 parent 4675e56 commit ca1ce2c

2 files changed

Lines changed: 7 additions & 14 deletions

File tree

Dockerfile

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RUN apt-get install -y \
99
g++ \
1010
build-essential \
1111
libncurses-dev \
12-
python2.7 \
1312
libpython-dev \
1413
cython \
1514
libx11-dev \
@@ -20,30 +19,27 @@ RUN apt-get install -y \
2019
libtool \
2120
libxext-dev \
2221
libncurses-dev \
23-
python2.7-dev \
2422
xfonts-100dpi \
2523
libopenmpi-dev \
26-
python2.7-scipy \
2724
make \
2825
zlib1g-dev \
2926
unzip \
3027
vim \
3128
libpng-dev
3229

33-
# Install latest NEURON
30+
# Switch to non sudo, create a Python 3 virtual environment
31+
USER $NB_USER
32+
RUN conda create --name snakes python=3.7
33+
34+
# Install latest iv and NEURON
3435
RUN git clone --branch 7.6.2 https://github.com/neuronsimulator/nrn
3536
WORKDIR nrn
3637
RUN ./build.sh
37-
RUN ./configure --without-x --with-nrnpython=python2 --without-paranrn --prefix="/home/jovyan/work/nrn/" --without-iv
38+
# Activate conda to configure nrn with the right python version
39+
RUN /bin/bash -c "source activate snakes && ./configure --without-x --with-nrnpython=python3 --without-paranrn --prefix='/home/jovyan/work/nrn/' --without-iv"
3840
RUN make --silent -j4
3941
RUN make --silent install -j4
4042

41-
# Switch to non sudo, create a Python 2 virtual environment
42-
USER $NB_USER
43-
# Commenting out the conda update things broke!
44-
# RUN conda update conda
45-
RUN conda create --name snakes python=2
46-
4743
# Install NEURON python
4844
WORKDIR src/nrnpython
4945
ENV PATH="/home/jovyan/work/nrn/x86_64/bin:${PATH}"

Dockerfile_dev

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ RUN apt-get install -y \
3333

3434
# Switch to non sudo, create a Python 3 virtual environment
3535
USER $NB_USER
36-
# Commenting out the conda update things broke!
37-
# RUN conda update conda
38-
# python 3 implies python 3.7 at this moment in time. Probably we want to specify exactly the version
3936
RUN conda create --name snakes python=3.7
4037

4138
# Install latest iv and NEURON

0 commit comments

Comments
 (0)