Skip to content

Commit 7978f8c

Browse files
committed
#netpyne-132 fixing env variables and pip cache
1 parent 7b07f8f commit 7978f8c

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ RUN rm -Rf node_modules/*
1818
FROM jupyter/base-notebook:hub-1.5.0
1919
ENV NB_UID=jovyan
2020
ENV FOLDER=netpyne
21-
ARG GEPPETTO_VERSION=development
2221
ARG BUILD_ARGS=""
23-
ARG NETPYNE_VERSION=master
2422
ARG WORKSPACE_VERSION=master
23+
# ARG GEPPETTO_VERSION=development
24+
# ARG NETPYNE_VERSION=master
2525

2626
ENV FOLDER=/home/jovyan/work/NetPyNE-UI
2727

@@ -32,10 +32,9 @@ RUN apt-get update -qq &&\
3232
apt-get install python3-tk vim nano unzip git make libtool g++ -qq pkg-config libfreetype6-dev libpng-dev libopenmpi-dev openjdk-11-jre-headless -y -y
3333
RUN conda install python=3.7 -y
3434

35-
3635
WORKDIR $FOLDER
3736
COPY --chown=1000:1000 requirements.txt requirements.txt
38-
RUN pip install -r requirements.txt --no-cache-dir --prefer-binary
37+
RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip && pip install -r requirements.txt --prefer-binary
3938

4039
COPY --chown=$NB_UID:1000 . .
4140
COPY --from=jsbuild --chown=$NB_UID:1000 /app webapp
@@ -46,7 +45,7 @@ RUN jupyter nbextension enable --py --sys-prefix jupyter_geppetto
4645
RUN jupyter nbextension enable --py --sys-prefix widgetsnbextension
4746
RUN jupyter serverextension enable --py --sys-prefix jupyter_geppetto
4847

49-
RUN python utilities/install.py ${BUILD_ARGS} --workspace WORKSPACE_VERSION --npm-skip
48+
RUN python utilities/install.py ${BUILD_ARGS} --workspace $WORKSPACE_VERSION --npm-skip
5049

5150
RUN jupyter labextension disable @jupyterlab/hub-extension
5251

@@ -58,7 +57,7 @@ ENV NEURON_HOME=/opt/conda
5857
# For lfpykit 0.4
5958
# RUN wget -P $(pip show LFPykit | grep "Location:" | awk '{print $2"/lfpykit"}') https://www.parralab.org/nyhead/sa_nyhead.mat
6059
# For lpfykit 0.5
61-
# RUN wget --no-check-certificate -P ${FOLDER}/workspace https://www.parralab.org/nyhead/sa_nyhead.mat
60+
RUN wget --no-check-certificate -P ${FOLDER}/workspace https://www.parralab.org/nyhead/sa_nyhead.mat
6261

6362
USER $NB_UID
6463

0 commit comments

Comments
 (0)