fix: dockerfile python version

Loop3D · Feb 9, 2023 · 49de51e · 49de51e
1 parent d0de548
commit 49de51e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,8 @@ RUN apt-get update -qq && \
     libopenmpi-dev \ 
     make 
 # RUN conda install -c conda-forge python=3.9 -y
-RUN conda install -c conda-forge -c loop3d pip \
+RUN conda install -c conda-forge -c loop3d python=3.9\
+    pip \
     map2model\
     hjson\
     owslib\
@@ -41,11 +42,13 @@ RUN conda install -c conda-forge -c loop3d pip \
     folium \
     jupyterlab \
     nodejs \
+    rasterio\
+    geopandas\
     -y
 
 RUN pip install ipyfilechooser
 RUN jupyter nbextension enable --py --sys-prefix ipyleaflet
-RUN pip install lavavu-osmesa geostatspy mplstereonet
+RUN pip install lavavu-osmesa=1.8.32 geostatspy mplstereonet
 
 ENV NB_USER jovyan
 ENV NB_UID 1000
@@ -80,6 +83,7 @@ RUN pip install -e LoopProjectFile
 # WORKDIR Tomofast-x
 # RUN make
 WORKDIR ${HOME}/notebooks
+
 # RUN pip install -e LoopStructural
 CMD ["jupyter", "lab", "--ip='0.0.0.0'", "--NotebookApp.token=''", "--no-browser" ]
 

diff --git a/DockerfileDev b/DockerfileDev
@@ -13,7 +13,8 @@ RUN apt-get update -qq && \
     libopenmpi-dev \ 
     make 
 # RUN conda install -c conda-forge python=3.9 -y
-RUN conda install -c conda-forge pip \
+RUN conda install -c conda-forge "python<=3.9" \
+    pip \
     scikit-learn \
     cython \
     numpy \
@@ -31,11 +32,12 @@ RUN conda install -c conda-forge pip \
     folium \
     jupyterlab \
     nodejs \
+    rasterio\
     -y
 
 RUN pip install ipyfilechooser
 RUN jupyter nbextension enable --py --sys-prefix ipyleaflet
-RUN pip install lavavu-osmesa
+RUN pip install lavavu-osmesa==1.8.32 pyevtk
 
 ENV NB_USER jovyan
 ENV NB_UID 1000