fix: docs/docker building in python 3.10

Loop3D · Mar 2, 2023 · 26bfaa2 · 26bfaa2
1 parent d95394e
commit 26bfaa2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ 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 python=3.9\
+RUN conda install -c conda-forge -c loop3d\
     pip \
     map2model\
     hjson\
@@ -22,9 +22,6 @@ RUN conda install -c conda-forge -c loop3d python=3.9\
     gdal=3.5.2\
     rasterio=1.2.10 \
     meshio\
-    scikit-fmm\
-    statsmodels\
-    numba\
     scikit-learn \
     cython \
     numpy \
@@ -48,7 +45,10 @@ RUN conda install -c conda-forge -c loop3d python=3.9\
 
 RUN pip install ipyfilechooser
 RUN jupyter nbextension enable --py --sys-prefix ipyleaflet
-RUN pip install lavavu-osmesa=1.8.32 geostatspy mplstereonet
+RUN pip install lavavu-osmesa mplstereonet
+
+ENV LD_LIBRARY_PATH=/opt/conda/lib/python3.10/site-packages/lavavu/
+
 
 ENV NB_USER jovyan
 ENV NB_UID 1000

diff --git a/docs/Dockerfile b/docs/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update -qq && \
     libc-dev \
     make
 RUN conda install -c conda-forge\
-    python"<=3.9"\
+    # python"<=3.8"\
     cython\
     numpy\ 
     pandas\ 
@@ -22,10 +22,11 @@ RUN conda install -c conda-forge\
     scikit-learn\ 
     scikit-image\ 
     networkx\
-    gcc\
     # geopandas\
-    # meshio\
+    libstdcxx-ng\
+    meshio\
     -y
-RUN pip install lavavu-osmesa==1.8.32
+RUN pip install lavavu-osmesa 
+ENV LD_LIBRARY_PATH=/opt/conda/lib/python3.10/site-packages/lavavu_osmesa.libs
 RUN conda install -c conda-forge pydata-sphinx-theme 
 RUN mkdir LoopStructural