diff --git a/base_images/isce2/docker/Dockerfile b/base_images/isce2/docker/Dockerfile index d2e09dd..7f345db 100644 --- a/base_images/isce2/docker/Dockerfile +++ b/base_images/isce2/docker/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive # install maap-py library ENV MAAP_CONF='/maap-py/' -RUN git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git \ +RUN git clone --single-branch --branch v3.1.3 https://github.com/MAAP-Project/maap-py.git \ && cd maap-py \ && pip install -e . @@ -31,7 +31,7 @@ WORKDIR /projects RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd RUN conda install -y -c conda-forge pyOpenSSL=23.2.0 && \ - conda install -y -n base conda-libmamba-solver && \ + conda install -y -n base conda-libmamba-solver=23.7.0 && \ conda config --set solver libmamba # need to uninstall jupyter_server_terminals as it conflicts with Jupyterlab 3.4.x. Doesn't seem to break anything diff --git a/base_images/isce3/docker/Dockerfile b/base_images/isce3/docker/Dockerfile index 257df4e..0d6e7f4 100644 --- a/base_images/isce3/docker/Dockerfile +++ b/base_images/isce3/docker/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive # install maap-py library ENV MAAP_CONF='/maap-py/' -RUN git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git \ +RUN git clone --single-branch --branch v3.1.3 https://github.com/MAAP-Project/maap-py.git \ && cd maap-py \ && pip install -e . @@ -17,7 +17,7 @@ WORKDIR /projects RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd RUN conda install -y -c conda-forge pyOpenSSL=23.2.0 && \ - conda install -y -n base conda-libmamba-solver && \ + conda install -y -n base conda-libmamba-solver=23.7.0 && \ conda config --set solver libmamba RUN conda install -y --solver=libmamba -c conda-forge isce3=0.12.0 xarray=2023.4.2 \ diff --git a/base_images/pangeo/docker/Dockerfile b/base_images/pangeo/docker/Dockerfile index a2c9946..2e49605 100644 --- a/base_images/pangeo/docker/Dockerfile +++ b/base_images/pangeo/docker/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive # install maap-py library ENV MAAP_CONF='/maap-py/' -RUN git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git \ +RUN git clone --single-branch --branch v3.1.3 https://github.com/MAAP-Project/maap-py.git \ && cd maap-py \ && pip install -e . @@ -14,7 +14,7 @@ WORKDIR /projects RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd RUN conda install -y -c conda-forge pyOpenSSL=23.2.0 && \ - conda install -y -n base conda-libmamba-solver && \ + conda install -y -n base conda-libmamba-solver=23.7.0 && \ conda config --set solver libmamba RUN conda install -y --solver=libmamba -c conda-forge gdal=3.6.2 matplotlib=3.6.2 Cython=0.29.33 h5py=3.7.0 numba=0.56.4 \ diff --git a/base_images/r/docker/Dockerfile b/base_images/r/docker/Dockerfile index 7a71ecb..cd9f645 100644 --- a/base_images/r/docker/Dockerfile +++ b/base_images/r/docker/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive # install maap-py library ENV MAAP_CONF='/maap-py/' -RUN git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git \ +RUN git clone --single-branch --branch v3.1.3 https://github.com/MAAP-Project/maap-py.git \ && cd maap-py \ && pip install -e . @@ -17,7 +17,7 @@ WORKDIR /projects RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd RUN conda install -y -c conda-forge pyOpenSSL=23.2.0 && \ - conda install -y -n base conda-libmamba-solver && \ + conda install -y -n base conda-libmamba-solver=23.7.0 && \ conda config --set solver libmamba RUN conda install -y --solver=libmamba -c conda-forge r==4.2 r-rgdal==1.5_32 r-sf==1.0_7 r-irkernel==1.3.2 r-gridExtra==2.3 \ diff --git a/base_images/rgedi/docker/Dockerfile b/base_images/rgedi/docker/Dockerfile index 3ebb25b..6725ec7 100644 --- a/base_images/rgedi/docker/Dockerfile +++ b/base_images/rgedi/docker/Dockerfile @@ -2,7 +2,7 @@ FROM continuumio/miniconda3:4.12.0 # install maap-py library ENV MAAP_CONF='/maap-py/' -RUN git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git \ +RUN git clone --single-branch --branch v3.1.3 https://github.com/MAAP-Project/maap-py.git \ && cd maap-py \ && pip install -e . @@ -12,7 +12,7 @@ RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd && echo "source activate r-wit RUN apt-get update && apt-get install -y libxt-dev && apt-get clean RUN conda install -y -c conda-forge pyOpenSSL=23.2.0 && \ - conda install -y -n base conda-libmamba-solver && \ + conda install -y -n base conda-libmamba-solver=23.7.0 && \ conda config --set solver libmamba RUN conda install -y --solver=libmamba -c conda-forge nb_conda_kernels diff --git a/base_images/vanilla/docker/Dockerfile b/base_images/vanilla/docker/Dockerfile index 2e0fe5d..47a8f19 100644 --- a/base_images/vanilla/docker/Dockerfile +++ b/base_images/vanilla/docker/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive # install maap-py library ENV MAAP_CONF='/maap-py/' -RUN git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git \ +RUN git clone --single-branch --branch v3.1.3 https://github.com/MAAP-Project/maap-py.git \ && cd maap-py \ && pip install -e . @@ -14,7 +14,7 @@ WORKDIR /projects RUN sed -i -e 's/\/root/\/projects/g' /etc/passwd RUN conda install -y -c conda-forge pyOpenSSL=23.2.0 && \ - conda install -y -n base conda-libmamba-solver && \ + conda install -y -n base conda-libmamba-solver=23.7.0 && \ conda config --set solver libmamba RUN conda install -y --solver=libmamba -c conda-forge gdal=3.6.2 matplotlib=3.6.2 Cython=0.29.33 h5py=3.7.0 numba=0.56.4 \ diff --git a/jupyterlab3/docker/Dockerfile b/jupyterlab3/docker/Dockerfile index 04fc1c9..72b6782 100644 --- a/jupyterlab3/docker/Dockerfile +++ b/jupyterlab3/docker/Dockerfile @@ -51,18 +51,18 @@ RUN jupyter labextension disable @jupyterlab/apputils-extension:announcements ############################### # Custom Jupyter Extensions ############################### -RUN jupyter labextension install @maap-jupyterlab/dps-jupyter-extension@0.4.6 --no-build +RUN jupyter labextension install @maap-jupyterlab/dps-jupyter-extension@0.5.1 --no-build # PyPi package prepended with 'maap' so it more easily discoverable -RUN pip install maap-jupyter-server-extension==1.1.1 +RUN pip install maap-jupyter-server-extension==1.2.2 RUN jupyter server extension enable jupyter_server_extension -RUN jupyter labextension install @maap-jupyterlab/algorithms_jupyter_extension@0.1.1 --no-build +RUN jupyter labextension install @maap-jupyterlab/algorithms_jupyter_extension@0.2.0 --no-build RUN jupyter labextension install @maap-jupyterlab/umf-jupyter-extension@1.0.0 --no-build RUN jupyter labextension install @maap-jupyterlab/maap-libs-jupyter-extension@1.0.2 --no-build RUN jupyter labextension install @maap-jupyterlab/edsc-jupyter-extension@1.0.4 --no-build RUN jupyter labextension install @maap-jupyterlab/user-workspace-management-jupyter-extension@0.0.5 --no-build -RUN jupyter labextension install @maap-jupyterlab/maap-help-jupyter-extension@1.0.0 --no-build +RUN jupyter labextension install @maap-jupyterlab/maap-help-jupyter-extension@1.0.1 --no-build RUN jupyter labextension install @maap-jupyterlab/che-sidebar-visibility-jupyter-extension@1.0.1 --no-build RUN jupyter lab build && \ diff --git a/jupyterlab3/environments.json b/jupyterlab3/environments.json index 5ba6e4d..f8d5190 100644 --- a/jupyterlab3/environments.json +++ b/jupyterlab3/environments.json @@ -37,7 +37,7 @@ "auth_server": "auth.maap-project.org", "mas_server": "mas.maap-project.org", "edsc_server": "ade.maap-project.org:30052", - "workspace_bucket": "maap-ops-dataset", + "workspace_bucket": "maap-ops-workspace", "default_host": false } ]