diff --git a/Dockerfile b/Dockerfile index 7900c4f..71ecdf4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_CONTAINER=ucsdets/datahub-base-notebook:stable +ARG BASE_CONTAINER=ghcr.io/ucsd-ets/datascience-notebook:2024.4-stable FROM $BASE_CONTAINER LABEL maintainer="UC San Diego ITS/ETS " @@ -16,19 +16,16 @@ RUN apt update -y && \ apt install graphviz -y RUN mamba install -c esri arcgis=2.2.0 -y -RUN mamba install numpy=1.22.4 -y || echo "Failed to install numpy" +RUN mamba install numpy -y RUN pip install --upgrade pip setuptools wheel RUN pip install --upgrade nbconvert RUN mamba install -c conda-forge geopandas cartopy pygeos pysal contextily osmnx jupyterlab_widgets -y -RUN pip uninstall pillow fiona -y || echo "Failed to uninstall pillow or fiona" && \ - pip install -r ~/requirements.txt || echo "Failed to install requirements" && \ - pip install --upgrade fiona || echo "Failed to upgrade fiona" - -RUN jupyter nbextension enable --py --sys-prefix arcgis && \ - jupyter nbextension enable --py --sys-prefix arcgis +RUN pip uninstall pillow fiona -y && \ + pip install -r ~/requirements.txt && \ + pip install --upgrade fiona USER $NB_UID diff --git a/requirements.txt b/requirements.txt index 6872bb7..d53e5e2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,5 +16,5 @@ pyshp==2.3.1 pandas==1.5.2 censusdata graphviz -numexpr==2.10.1 -bottleneck==1.4.2 \ No newline at end of file +# numexpr==2.10.1 +# bottleneck==1.4.2 \ No newline at end of file