Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge into main #76

Merged
merged 16 commits into from
Oct 30, 2023
Merged

Merge into main #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
72823ce
Feature/update maap help tour (#61)
grallewellyn Aug 21, 2023
00dceb4
Bugs/presigned url (#62)
grallewellyn Sep 7, 2023
e6d5677
Added memory extension (#59)
grallewellyn Sep 15, 2023
6e3e65a
hysds base-image [skip ci] (#65)
bsatoriu Sep 26, 2023
1f06847
Feature/libmamba solver (#64)
grallewellyn Sep 27, 2023
a0c6ac5
Update stac_ipyleaflet to 0.3.5 for Pangeo (#66)
anilnatha Sep 29, 2023
6ffbf76
Remove hysds base_image [skip-ci] (#68)
bsatoriu Sep 29, 2023
f8d7e64
Bugs/quick fix libmamba (#69)
grallewellyn Oct 9, 2023
3ba1e9c
Bugs/presigned url (#70)
grallewellyn Oct 10, 2023
a17b41c
Bugs/git tour link (#71)
grallewellyn Oct 18, 2023
3606ad8
updated custom ext versions (#72)
marjo-luc Oct 25, 2023
76f252c
Feature/update maap py (#73)
grallewellyn Oct 26, 2023
4b4fc3f
bumped jupyter server extension (#74)
marjo-luc Oct 28, 2023
25cced2
Bump maap-py to v3.1.3 (#75)
bsatoriu Oct 28, 2023
08f0b55
Merge branch 'main' into develop
sujen1412 Oct 30, 2023
72140d9
Update Dockerfile
marjo-luc Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions base_images/isce2/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions base_images/isce3/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions base_images/pangeo/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions base_images/r/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions base_images/rgedi/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions base_images/vanilla/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

Expand All @@ -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 \
Expand Down
8 changes: 4 additions & 4 deletions jupyterlab3/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion jupyterlab3/environments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
]